From b9c3aae792d06e01802c860f9cb8a463fb2a7428 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 23 May 2008 19:32:50 +0200 Subject: Include full path for python scripting dir to allow out-of-tree builds. (This used to be commit 01485bea87b7f7885ffed0cd3a0143baaa2d048e) --- source4/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/main.mk') diff --git a/source4/main.mk b/source4/main.mk index 5e31044c09..90473cce93 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -89,7 +89,7 @@ libclisrcdir := libcli mkinclude libcli/config.mk ejsscriptsrcdir := scripting/ejs mkinclude scripting/ejs/config.mk -pyscriptsrcdir := scripting/python +pyscriptsrcdir := $(srcdir)/scripting/python mkinclude scripting/python/config.mk kdcsrcdir := kdc mkinclude kdc/config.mk -- cgit From 5c66b80c07bfa379971ffaed1936b43a44f4e581 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 May 2008 13:38:39 +0200 Subject: Move version.o and dynconfig.o into their own directory. (This used to be commit 2cc924a412578c052a7793408300c28c8bc87c2d) --- source4/main.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/main.mk') diff --git a/source4/main.mk b/source4/main.mk index 90473cce93..b0de9525c1 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,4 +1,5 @@ -mkinclude dynconfig.mk +dynconfigsrcdir := dynconfig +mkinclude dynconfig/config.mk heimdalsrcdir := heimdal mkinclude heimdal_build/config.mk mkinclude config.mk -- cgit From 34402ecea613d386ca368a7bcb149e27cd7ef5c5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 May 2008 16:44:04 +0200 Subject: Move source dir variables to Makefile. (This used to be commit fdc7c3568e5fbf510c874601d72798454b1c1ca6) --- source4/main.mk | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) (limited to 'source4/main.mk') 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 -- cgit