s4-ldapcmp: Fix options parsing for common Samba options

[samba.git] / source4 / main.mk

diff --git a/source4/main.mk b/source4/main.mk
index 3f3aea87e67969ab5717ddc43e9d90d1db4db06e..d57fad3854c2044a6a6c0f70fa0755237905bc54 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,5 +1,4 @@
 mkinclude dynconfig/config.mk
-mkinclude heimdal_build/config.mk
 mkinclude config.mk
 mkinclude dsdb/config.mk
 mkinclude smbd/config.mk
@@ -7,26 +6,30 @@ 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 ../nsswitch/libwbclient/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
 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/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
+mkinclude ../lib/uid_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/util/config.mk
+mkinclude ../lib/tdr/config.mk
+mkinclude ../lib/tsocket/config.mk
+mkinclude ../lib/crypto/config.mk
+mkinclude ../lib/torture/config.mk
 mkinclude lib/basic.mk
+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
@@ -45,6 +48,17 @@ mkinclude torture/config.mk
 mkinclude librpc/config.mk
 mkinclude client/config.mk
 mkinclude libcli/config.mk
-mkinclude scripting/ejs/config.mk
+mkinclude ../libcli/smb/config.mk
+mkinclude ../libcli/cldap/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
+mkinclude ../libcli/nbt/config.mk
+mkinclude ../libcli/auth/config.mk
+mkinclude ../libcli/drsuapi/config.mk
+mkinclude ../libcli/samsync/config.mk
+mkinclude lib/policy/config.mk
+mkinclude ../libcli/named_pipe_auth/config.mk