summaryrefslogtreecommitdiff
path: root/source4/main.mk
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-23 11:47:38 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-23 11:47:38 +1100
commit7f113904eba5361d963075bcea7e36fd98ca34aa (patch)
tree2d5f22f3418a3439c306b3aaf570f52ff1d0823e /source4/main.mk
parent9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (diff)
parent979a1b06d01817a01967d9137e4f70f222fa8eab (diff)
downloadsamba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.gz
samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.bz2
samba-7f113904eba5361d963075bcea7e36fd98ca34aa.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/main.mk')
-rw-r--r--source4/main.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/main.mk b/source4/main.mk
index a143604f33..d7db0580e9 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -46,6 +46,7 @@ mkinclude torture/config.mk
mkinclude librpc/config.mk
mkinclude client/config.mk
mkinclude libcli/config.mk
+mkinclude ../libcli/cldap/config.mk
mkinclude scripting/python/config.mk
mkinclude kdc/config.mk
mkinclude ../lib/smbconf/config.mk