summaryrefslogtreecommitdiff
path: root/source4/main.mk
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-20 13:22:08 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-20 13:22:08 +1100
commit27c6eca04c4c1bb40ff36f3a08748e2f45770aa8 (patch)
treef87d3e6ca4958e9b9102ca8ee5fb3e5f0917570e /source4/main.mk
parent1f25b71d199a072f5ee1bdd8786e5c1c157f5888 (diff)
parent5fe2b28f45289dc5578cdd536600f0d30a14d820 (diff)
downloadsamba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.gz
samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.bz2
samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source4/main.mk')
-rw-r--r--source4/main.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/main.mk b/source4/main.mk
index ee2018fb69..a143604f33 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -20,7 +20,8 @@ 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/tdr/config.mk
+mkinclude ../lib/tsocket/config.mk
mkinclude ../lib/crypto/config.mk
mkinclude ../lib/torture/config.mk
mkinclude lib/basic.mk