Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

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

diff --git a/source4/main.mk b/source4/main.mk
index 368dce9f59ba38734a0db037d671a18630a75ce5..ee2018fb694f7dae00683c77eba272f8aac6a6a4 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -6,10 +6,10 @@ mkinclude cluster/config.mk
 mkinclude smbd/process_model.mk
 mkinclude libnet/config.mk
 mkinclude auth/config.mk
-mkinclude nsswitch/config.mk
+mkinclude ../nsswitch/config.mk
 mkinclude lib/samba3/config.mk
 mkinclude lib/socket/config.mk
-mkinclude lib/charset/config.mk
+mkinclude ../lib/util/charset/config.mk
 mkinclude lib/ldb-samba/config.mk
 mkinclude lib/tls/config.mk
 mkinclude lib/registry/config.mk
@@ -19,11 +19,10 @@ 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/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/torture/config.mk
 mkinclude lib/basic.mk
 mkinclude lib/com/config.mk
 # WMI fails at the moment
@@ -48,3 +47,8 @@ mkinclude client/config.mk
 mkinclude libcli/config.mk
 mkinclude scripting/python/config.mk
 mkinclude kdc/config.mk
+mkinclude ../lib/smbconf/config.mk
+mkinclude ../lib/async_req/config.mk
+mkinclude ../libcli/security/config.mk
+mkinclude ../libcli/ldap/config.mk
+