summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-18 19:07:07 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-18 19:07:07 +0200
commit4d2f44163e07995949fcf915019e0a6eb7c00b24 (patch)
treeee249d617f7b6a77df7b4b038ac49494faea6107
parent98154fdf05b725a9b7d7bdcd572a165c3fa865c1 (diff)
downloadsamba-4d2f44163e07995949fcf915019e0a6eb7c00b24.tar.gz
samba-4d2f44163e07995949fcf915019e0a6eb7c00b24.tar.bz2
samba-4d2f44163e07995949fcf915019e0a6eb7c00b24.zip
Use variables for source path in libnet/ and scripting/python.
(This used to be commit fb10a81b9484642099ecbe896eabe00a4417bc42)
-rw-r--r--source4/libnet/config.mk4
-rw-r--r--source4/main.mk2
-rw-r--r--source4/scripting/python/config.mk12
3 files changed, 10 insertions, 8 deletions
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 243fc1813a..2d82b0bc42 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -2,7 +2,7 @@
PRIVATE_PROTO_HEADER = libnet_proto.h
PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION
-LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \
+LIBSAMBA-NET_OBJ_FILES = $(addprefix $(libnetdir)/, \
libnet.o libnet_passwd.o libnet_time.o libnet_rpc.o \
libnet_join.o libnet_site.o libnet_become_dc.o libnet_unbecome_dc.o \
libnet_vampire.o libnet_samdump.o libnet_samdump_keytab.o \
@@ -13,4 +13,4 @@ LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \
[PYTHON::python_net]
PRIVATE_DEPENDENCIES = LIBSAMBA-NET
-python_net_OBJ_FILES = libnet/py_net.o
+python_net_OBJ_FILES = $(libnetdir)/py_net.o
diff --git a/source4/main.mk b/source4/main.mk
index b8364aca5a..79fd61581f 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -5,6 +5,7 @@ mkinclude dsdb/config.mk
mkinclude smbd/config.mk
mkinclude cluster/config.mk
mkinclude smbd/process_model.mk
+libnetdir := libnet/
mkinclude libnet/config.mk
mkinclude auth/config.mk
mkinclude nsswitch/config.mk
@@ -27,5 +28,6 @@ mkinclude librpc/config.mk
mkinclude client/config.mk
mkinclude libcli/config.mk
mkinclude scripting/ejs/config.mk
+pyscriptdir := scripting/python
mkinclude scripting/python/config.mk
mkinclude kdc/config.mk
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 83b1b1eefb..b5b1895793 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -3,26 +3,26 @@ PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
PRIVATE_DEPENDENCIES = PYTALLOC
INIT_FUNCTION_SENTINEL = { NULL, NULL }
-LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o)
+LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptdir)/, modules.o)
[SUBSYSTEM::PYTALLOC]
PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
-PYTALLOC_OBJ_FILES = $(addprefix scripting/python/, pytalloc.o)
+PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptdir)/, pytalloc.o)
[PYTHON::python_uuid]
PRIVATE_DEPENDENCIES = LIBNDR
-python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
+python_uuid_OBJ_FILES = $(pyscriptdir)/uuidmodule.o
[PYTHON::python_misc]
PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
SWIG_FILE = misc.i
-python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+python_misc_OBJ_FILES = $(pyscriptdir)/misc_wrap.o
-_PY_FILES = $(shell find scripting/python -name "*.py")
+_PY_FILES = $(shell find $(pyscriptdir) -name "*.py")
-$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
+$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptdir)/%,%,$(pyfile)),$(pyfile))))
install:: installpython