Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

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

diff --git a/source4/main.mk b/source4/main.mk
index 79fd61581f09c3ad070b4ac13ff411e042a0e7bd..3f3aea87e67969ab5717ddc43e9d90d1db4db06e 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,14 +1,31 @@
-mkinclude dynconfig.mk
+mkinclude dynconfig/config.mk
 mkinclude heimdal_build/config.mk
 mkinclude config.mk
 mkinclude dsdb/config.mk
 mkinclude smbd/config.mk
 mkinclude cluster/config.mk
 mkinclude smbd/process_model.mk
-libnetdir := libnet/
 mkinclude libnet/config.mk
 mkinclude auth/config.mk
 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/appweb/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
 mkinclude param/config.mk
 mkinclude smb_server/config.mk
@@ -19,6 +36,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
@@ -28,6 +46,5 @@ mkinclude librpc/config.mk
 mkinclude client/config.mk
 mkinclude libcli/config.mk
 mkinclude scripting/ejs/config.mk
-pyscriptdir := scripting/python
 mkinclude scripting/python/config.mk
 mkinclude kdc/config.mk