From 30ad1af106b7cd3b94e65ff30fd268ecfb7b3929 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 19:37:24 +0200
Subject: Use variable for param src dir. (This used to be commit
 f97bc5735803a73181030e6d7db2862ebc1b7f4b)

---
 source4/main.mk         |  1 +
 source4/param/config.mk | 26 +++++++++-----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'source4')

diff --git a/source4/main.mk b/source4/main.mk
index a07d188b53..dffe793a5c 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -11,6 +11,7 @@ mkinclude libnet/config.mk
 mkinclude auth/config.mk
 mkinclude nsswitch/config.mk
 mkinclude lib/basic.mk
+paramsrcdir := param
 mkinclude param/config.mk
 mkinclude smb_server/config.mk
 mkinclude rpc_server/config.mk
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 4c202dc6de..bdc8dd422d 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -5,25 +5,17 @@ PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
 LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1
 LIBSAMBA-HOSTCONFIG_SOVERSION = 0
 
-LIBSAMBA-HOSTCONFIG_OBJ_FILES = param/loadparm.o \
-			param/generic.o \
-			param/util.o \
-			lib/version.o
-
-LIBSAMBA-CONFIG_OBJ_FILES = param/loadparm.o \
-			param/params.o \
-			param/generic.o \
-			param/util.o \
-			lib/version.o
+LIBSAMBA-HOSTCONFIG_OBJ_FILES = $(addprefix $(paramsrcdir)/,  \
+			loadparm.o generic.o util.o) lib/version.o
 
 PUBLIC_HEADERS += param/param.h
 
-PC_FILES += param/samba-hostconfig.pc
+PC_FILES += $(paramsrcdir)/samba-hostconfig.pc
 
 [SUBSYSTEM::PROVISION]
 PRIVATE_DEPENDENCIES = LIBPYTHON
 
-PROVISION_OBJ_FILES = param/provision.o
+PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o
 
 #################################
 # Start SUBSYSTEM share
@@ -33,7 +25,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM share
 #################################
 
-share_OBJ_FILES = param/share.o
+share_OBJ_FILES = $(paramsrcdir)/share.o
 
 PUBLIC_HEADERS += param/share.h
 
@@ -46,7 +38,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End MODULE share_classic
 ################################################
 
-share_classic_OBJ_FILES = param/share_classic.o 
+share_classic_OBJ_FILES = $(paramsrcdir)/share_classic.o 
 
 ################################################
 # Start MODULE share_ldb
@@ -57,15 +49,15 @@ PRIVATE_DEPENDENCIES = LIBLDB LDB_WRAP
 # End MODULE share_ldb
 ################################################
 
-share_ldb_OBJ_FILES = param/share_ldb.o 
+share_ldb_OBJ_FILES = $(paramsrcdir)/share_ldb.o 
 
 [SUBSYSTEM::SECRETS]
 PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB NDR_SECURITY
 
-SECRETS_OBJ_FILES = param/secrets.o
+SECRETS_OBJ_FILES = $(paramsrcdir)/secrets.o
 
 [PYTHON::param]
 SWIG_FILE = param.i
 PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG
 
-param_OBJ_FILES = param/param_wrap.o
+param_OBJ_FILES = $(paramsrcdir)/param_wrap.o
-- 
cgit