summaryrefslogtreecommitdiff
path: root/source4/lib/cmdline/config.mk
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-15 09:54:41 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-15 09:54:41 +0200
commitb967afca648eea481e586f367f99464418cf8468 (patch)
tree3fbe9cc92a21013cbd1eb2b6fa1b73ccddfbb151 /source4/lib/cmdline/config.mk
parent9cd04363f56ba5ee4f8b1ffaf662fe81cc995e99 (diff)
parentafaba23131dc079be3cd92e87495ec8b2ebdc4ae (diff)
downloadsamba-b967afca648eea481e586f367f99464418cf8468.tar.gz
samba-b967afca648eea481e586f367f99464418cf8468.tar.bz2
samba-b967afca648eea481e586f367f99464418cf8468.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)
Diffstat (limited to 'source4/lib/cmdline/config.mk')
-rw-r--r--source4/lib/cmdline/config.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 87014d4d53..f8a971a063 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,16 +1,19 @@
[SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
PRIVATE_PROTO_HEADER = credentials.h
-OBJ_FILES = credentials.o
PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
+LIBCMDLINE_CREDENTIALS_OBJ_FILES = lib/cmdline/credentials.o
+
[SUBSYSTEM::POPT_SAMBA]
-OBJ_FILES = popt_common.o
PUBLIC_DEPENDENCIES = LIBPOPT
+POPT_SAMBA_OBJ_FILES = lib/cmdline/popt_common.o
+
PUBLIC_HEADERS += lib/cmdline/popt_common.h
[SUBSYSTEM::POPT_CREDENTIALS]
PRIVATE_PROTO_HEADER = popt_credentials.h
-OBJ_FILES = popt_credentials.o
PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
+
+POPT_CREDENTIALS_OBJ_FILES = lib/cmdline/popt_credentials.o