diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 19:37:58 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 19:37:58 +0200 |
| commit | 964257956d4046658c6177a2423c55d2c5bb9f45 (patch) | |
| tree | 24e9e9b0149cf8da7c2581862e7bb77a4942ba06 | |
| parent | adc84e12865115f15df01676b2040d9e06cafa2c (diff) | |
| parent | 30ad1af106b7cd3b94e65ff30fd268ecfb7b3929 (diff) | |
| download | samba-964257956d4046658c6177a2423c55d2c5bb9f45.tar.gz samba-964257956d4046658c6177a2423c55d2c5bb9f45.tar.bz2 samba-964257956d4046658c6177a2423c55d2c5bb9f45.zip | |
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 3a83d4ebd41908aa0f88eec5b05156112ea0ca7b)
| -rw-r--r-- | source4/main.mk | 1 | ||||
| -rw-r--r-- | source4/param/config.mk | 26 |
2 files changed, 10 insertions, 17 deletions
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 |