git.samba.org
/
amitay
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
[amitay/samba.git]
/
source4
/
main.mk
diff --git
a/source4/main.mk
b/source4/main.mk
index ddeb4baf2ecc2e64d4272afba68e705b027b327d..0edfa1c14418ee54ebfb3a56ffeab4bcc09b2685 100644
(file)
--- a/
source4/main.mk
+++ b/
source4/main.mk
@@
-18,7
+18,6
@@
mkinclude lib/events/config.mk
mkinclude lib/cmdline/config.mk
mkinclude ../lib/socket_wrapper/config.mk
mkinclude ../lib/nss_wrapper/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/stream/config.mk
mkinclude lib/util/config.mk
mkinclude lib/tdr/config.mk
@@
-47,6
+46,5
@@
mkinclude torture/config.mk
mkinclude librpc/config.mk
mkinclude client/config.mk
mkinclude libcli/config.mk
mkinclude librpc/config.mk
mkinclude client/config.mk
mkinclude libcli/config.mk
-mkinclude scripting/ejs/config.mk
mkinclude scripting/python/config.mk
mkinclude kdc/config.mk
mkinclude scripting/python/config.mk
mkinclude kdc/config.mk