X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source4%2Fmain.mk;h=04f7a36a5f26d121a03caae81bd5c28fce482462;hb=d400de2ffa53bebe13cba0d2d3c18dcc05bc37bd;hp=90473cce9314af4a5e4ff2094b300c986219468b;hpb=b9c3aae792d06e01802c860f9cb8a463fb2a7428;p=tprouty%2Fsamba.git

diff --git a/source4/main.mk b/source4/main.mk
index 90473cce93..04f7a36a5f 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,95 +1,52 @@
-mkinclude dynconfig.mk
-heimdalsrcdir := heimdal
-mkinclude heimdal_build/config.mk
+mkinclude dynconfig/config.mk
 mkinclude config.mk
-dsdbsrcdir := dsdb
 mkinclude dsdb/config.mk
-smbdsrcdir := smbd
 mkinclude smbd/config.mk
-clustersrcdir := cluster
 mkinclude cluster/config.mk
 mkinclude smbd/process_model.mk
-libnetsrcdir := libnet
 mkinclude libnet/config.mk
-authsrcdir := auth
 mkinclude auth/config.mk
-nsswitchsrcdir := nsswitch
-mkinclude nsswitch/config.mk
-libsrcdir := lib
+mkinclude ../nsswitch/config.mk
 mkinclude lib/samba3/config.mk
-libsocketsrcdir := lib/socket
 mkinclude lib/socket/config.mk
-libcharsetsrcdir := lib/charset
-mkinclude lib/charset/config.mk
-ldb_sambasrcdir := lib/ldb-samba
+mkinclude ../lib/util/charset/config.mk
 mkinclude lib/ldb-samba/config.mk
-libtlssrcdir := lib/tls
 mkinclude lib/tls/config.mk
-libregistrysrcdir := lib/registry
 mkinclude lib/registry/config.mk
-libmessagingsrcdir := lib/messaging
 mkinclude lib/messaging/config.mk
-libeventssrcdir := lib/events
 mkinclude lib/events/config.mk
-libcmdlinesrcdir := lib/cmdline
 mkinclude lib/cmdline/config.mk
-socketwrappersrcdir := lib/socket_wrapper
-mkinclude lib/socket_wrapper/config.mk
-nsswrappersrcdir := lib/nss_wrapper
-mkinclude lib/nss_wrapper/config.mk
-appwebsrcdir := lib/appweb
-mkinclude lib/appweb/config.mk
-libstreamsrcdir := lib/stream
+mkinclude ../lib/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/stream/config.mk
-libutilsrcdir := lib/util
-mkinclude lib/util/config.mk
-libtdrsrcdir := lib/tdr
+mkinclude ../lib/util/config.mk
 mkinclude lib/tdr/config.mk
-libdbwrapsrcdir := lib/dbwrap
-mkinclude lib/dbwrap/config.mk
-libcryptosrcdir := lib/crypto
-mkinclude lib/crypto/config.mk
-libtorturesrcdir := lib/torture
-mkinclude lib/torture/config.mk
-libcompressionsrcdir := lib/compression
-libgencachesrcdir := lib
+mkinclude ../lib/crypto/config.mk
+mkinclude ../lib/torture/config.mk
 mkinclude lib/basic.mk
-paramsrcdir := param
+mkinclude lib/com/config.mk
+# WMI fails at the moment
+# mkinclude lib/wmi/config.mk
 mkinclude param/config.mk
-smb_serversrcdir := smb_server
 mkinclude smb_server/config.mk
-rpc_serversrcdir := rpc_server
 mkinclude rpc_server/config.mk
-ldap_serversrcdir := ldap_server
 mkinclude ldap_server/config.mk
-web_serversrcdir := web_server
 mkinclude web_server/config.mk
-winbindsrcdir := winbind
 mkinclude winbind/config.mk
-nbt_serversrcdir := nbt_server
 mkinclude nbt_server/config.mk
-wrepl_serversrcdir := wrepl_server
 mkinclude wrepl_server/config.mk
-cldap_serversrcdir := cldap_server
 mkinclude cldap_server/config.mk
-utilssrcdir := utils
+mkinclude ntp_signd/config.mk
 mkinclude utils/net/config.mk
 mkinclude utils/config.mk
-ntvfssrcdir := ntvfs
 mkinclude ntvfs/config.mk
-ntptrsrcdir := ntptr
 mkinclude ntptr/config.mk
-torturesrcdir := torture
 mkinclude torture/config.mk
-librpcsrcdir := librpc
 mkinclude librpc/config.mk
-clientsrcdir := client
 mkinclude client/config.mk
-libclisrcdir := libcli
 mkinclude libcli/config.mk
-ejsscriptsrcdir := scripting/ejs
-mkinclude scripting/ejs/config.mk
-pyscriptsrcdir := $(srcdir)/scripting/python
 mkinclude scripting/python/config.mk
-kdcsrcdir := kdc
 mkinclude kdc/config.mk
+mkinclude ../lib/smbconf/config.mk
+mkinclude ../lib/async_req/config.mk
+mkinclude ../libcli/security/config.mk