diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-31 08:35:55 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-31 08:35:55 +1000 |
| commit | be14efbdf9de964d36b1fdbc8dec909ad1d2601f (patch) | |
| tree | d46a633b29a0d0f3e1096b21f5da69f611d506e7 /source4/lib/ldb/tools | |
| parent | 277287114679addc2ef26fbe6a82963f9cf1b196 (diff) | |
| download | samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.tar.gz samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.tar.bz2 samba-be14efbdf9de964d36b1fdbc8dec909ad1d2601f.zip | |
Revert Jelmer's CFLAGS commit e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c
This commit broke the build, because not all files (libreplace, popt)
were updated.
Andrew Bartlett
(This used to be commit 3faacf4351d68a10aea78b53768571d2059772ae)
Diffstat (limited to 'source4/lib/ldb/tools')
| -rw-r--r-- | source4/lib/ldb/tools/config.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk index 5efbd20396..051fd0c57b 100644 --- a/source4/lib/ldb/tools/config.mk +++ b/source4/lib/ldb/tools/config.mk @@ -1,6 +1,7 @@ ################################################ # 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 @@ -8,8 +9,6 @@ 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] @@ -19,8 +18,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 @@ -34,7 +33,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbdel_OBJ_FILES = $(ldbdir)/tools/ldbdel.o -$(ldbdel_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbdel.1 @@ -48,7 +46,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbmodify_OBJ_FILES = $(ldbdir)/tools/ldbmodify.o -$(ldbmodify_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbmodify.1 ################################################ @@ -61,7 +58,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbsearch_OBJ_FILES = $(ldbdir)/tools/ldbsearch.o -$(ldbsearch_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbsearch.1 @@ -75,7 +71,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbedit_OBJ_FILES = $(ldbdir)/tools/ldbedit.o -$(ldbedit_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbedit.1 @@ -89,7 +84,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbrename_OBJ_FILES = $(ldbdir)/tools/ldbrename.o -$(ldbrename_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbrename.1 |