Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

[amitay/samba.git] / source4 / main.mk

diff --git a/source4/main.mk b/source4/main.mk
index 2df8ddd25ead0adea46c3b27a436607970bdf593..0edfa1c14418ee54ebfb3a56ffeab4bcc09b2685 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,22 +1,33 @@
-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
+mkinclude lib/samba3/config.mk
+mkinclude lib/socket/config.mk
+mkinclude lib/charset/config.mk
+mkinclude lib/ldb-samba/config.mk
+mkinclude lib/tls/config.mk
+mkinclude lib/registry/config.mk
+mkinclude lib/messaging/config.mk
+mkinclude lib/events/config.mk
+mkinclude lib/cmdline/config.mk
+mkinclude ../lib/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
+mkinclude lib/stream/config.mk
+mkinclude lib/util/config.mk
+mkinclude lib/tdr/config.mk
+mkinclude lib/dbwrap/config.mk
+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
 mkinclude smb_server/config.mk
 mkinclude rpc_server/config.mk
@@ -26,6 +37,7 @@ mkinclude winbind/config.mk
 mkinclude nbt_server/config.mk
 mkinclude wrepl_server/config.mk
 mkinclude cldap_server/config.mk
+mkinclude ntp_signd/config.mk
 mkinclude utils/net/config.mk
 mkinclude utils/config.mk
 mkinclude ntvfs/config.mk
@@ -34,8 +46,5 @@ mkinclude torture/config.mk
 mkinclude librpc/config.mk
 mkinclude client/config.mk
 mkinclude libcli/config.mk
-mkinclude scripting/ejs/config.mk
-pyscriptsrcdir := scripting/python
 mkinclude scripting/python/config.mk
-kdcsrcdir := kdc
 mkinclude kdc/config.mk