summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/tools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-30 02:07:28 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-30 02:07:28 +0200
commit39f50afc579f208300c3c1fcc612ca9b69bb76e3 (patch)
tree55a14b4f6a45c68e9d0b4ab314af3c122df3abf1 /source4/lib/ldb/tools
parenta127b1b1b0b353a4b28dbe4f726b57e8359a62d5 (diff)
downloadsamba-39f50afc579f208300c3c1fcc612ca9b69bb76e3.tar.gz
samba-39f50afc579f208300c3c1fcc612ca9b69bb76e3.tar.bz2
samba-39f50afc579f208300c3c1fcc612ca9b69bb76e3.zip
Move CFLAGS handling out of smb_build.
(This used to be commit e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c)
Diffstat (limited to 'source4/lib/ldb/tools')
-rw-r--r--source4/lib/ldb/tools/config.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
index 051fd0c57b..5efbd20396 100644
--- a/source4/lib/ldb/tools/config.mk
+++ b/source4/lib/ldb/tools/config.mk
@@ -1,7 +1,6 @@
################################################
# Start SUBSYSTEM LIBLDB_CMDLINE
[SUBSYSTEM::LIBLDB_CMDLINE]
-CFLAGS = -I$(ldbdir) -I$(ldbdir)/include
PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
# End SUBSYSTEM LIBLDB_CMDLINE
@@ -9,6 +8,8 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
LIBLDB_CMDLINE_OBJ_FILES = $(ldbdir)/tools/cmdline.o
+$(LIBLDB_CMDLINE_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
+
################################################
# Start BINARY ldbadd
[BINARY::ldbadd]
@@ -18,8 +19,8 @@ PRIVATE_DEPENDENCIES = \
# End BINARY ldbadd
################################################
-
ldbadd_OBJ_FILES = $(ldbdir)/tools/ldbadd.o
+$(ldbadd_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
MANPAGES += $(ldbdir)/man/ldbadd.1
@@ -33,6 +34,7 @@ PRIVATE_DEPENDENCIES = \
################################################
ldbdel_OBJ_FILES = $(ldbdir)/tools/ldbdel.o
+$(ldbdel_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
MANPAGES += $(ldbdir)/man/ldbdel.1
@@ -46,6 +48,7 @@ PRIVATE_DEPENDENCIES = \
################################################
ldbmodify_OBJ_FILES = $(ldbdir)/tools/ldbmodify.o
+$(ldbmodify_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
MANPAGES += $(ldbdir)/man/ldbmodify.1
################################################
@@ -58,6 +61,7 @@ PRIVATE_DEPENDENCIES = \
################################################
ldbsearch_OBJ_FILES = $(ldbdir)/tools/ldbsearch.o
+$(ldbsearch_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
MANPAGES += $(ldbdir)/man/ldbsearch.1
@@ -71,6 +75,7 @@ PRIVATE_DEPENDENCIES = \
################################################
ldbedit_OBJ_FILES = $(ldbdir)/tools/ldbedit.o
+$(ldbedit_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
MANPAGES += $(ldbdir)/man/ldbedit.1
@@ -84,6 +89,7 @@ PRIVATE_DEPENDENCIES = \
################################################
ldbrename_OBJ_FILES = $(ldbdir)/tools/ldbrename.o
+$(ldbrename_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
MANPAGES += $(ldbdir)/man/ldbrename.1