summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-27 16:44:04 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-27 16:44:04 +0200
commit34402ecea613d386ca368a7bcb149e27cd7ef5c5 (patch)
tree336cffd4da552f7363192b57798ef91b20f4bc56
parent16c883ca23a23d3784aec059ac949a066c29ac0d (diff)
downloadsamba-34402ecea613d386ca368a7bcb149e27cd7ef5c5.tar.gz
samba-34402ecea613d386ca368a7bcb149e27cd7ef5c5.tar.bz2
samba-34402ecea613d386ca368a7bcb149e27cd7ef5c5.zip
Move source dir variables to Makefile.
(This used to be commit fdc7c3568e5fbf510c874601d72798454b1c1ca6)
-rw-r--r--source4/Makefile48
-rw-r--r--source4/main.mk47
2 files changed, 48 insertions, 47 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 069fece855..370be2a2da 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -49,6 +49,54 @@ endif
include $(srcdir)/build/make/rules.mk
include $(srcdir)/build/make/python.mk
+dynconfigsrcdir := dynconfig
+heimdalsrcdir := heimdal
+dsdbsrcdir := dsdb
+smbdsrcdir := smbd
+clustersrcdir := cluster
+libnetsrcdir := libnet
+authsrcdir := auth
+nsswitchsrcdir := nsswitch
+libsrcdir := lib
+libsocketsrcdir := lib/socket
+libcharsetsrcdir := lib/charset
+ldb_sambasrcdir := lib/ldb-samba
+libtlssrcdir := lib/tls
+libregistrysrcdir := lib/registry
+libmessagingsrcdir := lib/messaging
+libeventssrcdir := lib/events
+libcmdlinesrcdir := lib/cmdline
+socketwrappersrcdir := lib/socket_wrapper
+nsswrappersrcdir := lib/nss_wrapper
+appwebsrcdir := lib/appweb
+libstreamsrcdir := lib/stream
+libutilsrcdir := lib/util
+libtdrsrcdir := lib/tdr
+libdbwrapsrcdir := lib/dbwrap
+libcryptosrcdir := lib/crypto
+libtorturesrcdir := lib/torture
+smb_serversrcdir := smb_server
+libcompressionsrcdir := lib/compression
+libgencachesrcdir := lib
+paramsrcdir := param
+rpc_serversrcdir := rpc_server
+ldap_serversrcdir := ldap_server
+web_serversrcdir := web_server
+winbindsrcdir := winbind
+nbt_serversrcdir := nbt_server
+wrepl_serversrcdir := wrepl_server
+cldap_serversrcdir := cldap_server
+utilssrcdir := utils
+clientsrcdir := client
+torturesrcdir := torture
+ntvfssrcdir := ntvfs
+ntptrsrcdir := ntptr
+librpcsrcdir := librpc
+libclisrcdir := libcli
+ejsscriptsrcdir := scripting/ejs
+pyscriptsrcdir := $(srcdir)/scripting/python
+kdcsrcdir := kdc
+
include data.mk
BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
diff --git a/source4/main.mk b/source4/main.mk
index b0de9525c1..4fd1502fae 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,96 +1,49 @@
-dynconfigsrcdir := dynconfig
mkinclude dynconfig/config.mk
-heimdalsrcdir := heimdal
mkinclude heimdal_build/config.mk
mkinclude config.mk
-dsdbsrcdir := dsdb
mkinclude dsdb/config.mk
-smbdsrcdir := smbd
mkinclude smbd/config.mk
-clustersrcdir := cluster
mkinclude cluster/config.mk
mkinclude smbd/process_model.mk
-libnetsrcdir := libnet
mkinclude libnet/config.mk
-authsrcdir := auth
mkinclude auth/config.mk
-nsswitchsrcdir := nsswitch
mkinclude nsswitch/config.mk
-libsrcdir := lib
mkinclude lib/samba3/config.mk
-libsocketsrcdir := lib/socket
mkinclude lib/socket/config.mk
-libcharsetsrcdir := lib/charset
mkinclude lib/charset/config.mk
-ldb_sambasrcdir := lib/ldb-samba
mkinclude lib/ldb-samba/config.mk
-libtlssrcdir := lib/tls
mkinclude lib/tls/config.mk
-libregistrysrcdir := lib/registry
mkinclude lib/registry/config.mk
-libmessagingsrcdir := lib/messaging
mkinclude lib/messaging/config.mk
-libeventssrcdir := lib/events
mkinclude lib/events/config.mk
-libcmdlinesrcdir := lib/cmdline
mkinclude lib/cmdline/config.mk
-socketwrappersrcdir := lib/socket_wrapper
mkinclude lib/socket_wrapper/config.mk
-nsswrappersrcdir := lib/nss_wrapper
mkinclude lib/nss_wrapper/config.mk
-appwebsrcdir := lib/appweb
mkinclude lib/appweb/config.mk
-libstreamsrcdir := lib/stream
mkinclude lib/stream/config.mk
-libutilsrcdir := lib/util
mkinclude lib/util/config.mk
-libtdrsrcdir := lib/tdr
mkinclude lib/tdr/config.mk
-libdbwrapsrcdir := lib/dbwrap
mkinclude lib/dbwrap/config.mk
-libcryptosrcdir := lib/crypto
mkinclude lib/crypto/config.mk
-libtorturesrcdir := lib/torture
mkinclude lib/torture/config.mk
-libcompressionsrcdir := lib/compression
-libgencachesrcdir := lib
mkinclude lib/basic.mk
-paramsrcdir := param
mkinclude param/config.mk
-smb_serversrcdir := smb_server
mkinclude smb_server/config.mk
-rpc_serversrcdir := rpc_server
mkinclude rpc_server/config.mk
-ldap_serversrcdir := ldap_server
mkinclude ldap_server/config.mk
-web_serversrcdir := web_server
mkinclude web_server/config.mk
-winbindsrcdir := winbind
mkinclude winbind/config.mk
-nbt_serversrcdir := nbt_server
mkinclude nbt_server/config.mk
-wrepl_serversrcdir := wrepl_server
mkinclude wrepl_server/config.mk
-cldap_serversrcdir := cldap_server
mkinclude cldap_server/config.mk
-utilssrcdir := utils
mkinclude utils/net/config.mk
mkinclude utils/config.mk
-ntvfssrcdir := ntvfs
mkinclude ntvfs/config.mk
-ntptrsrcdir := ntptr
mkinclude ntptr/config.mk
-torturesrcdir := torture
mkinclude torture/config.mk
-librpcsrcdir := librpc
mkinclude librpc/config.mk
-clientsrcdir := client
mkinclude client/config.mk
-libclisrcdir := libcli
mkinclude libcli/config.mk
-ejsscriptsrcdir := scripting/ejs
mkinclude scripting/ejs/config.mk
-pyscriptsrcdir := $(srcdir)/scripting/python
mkinclude scripting/python/config.mk
-kdcsrcdir := kdc
mkinclude kdc/config.mk