summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-05-16 19:23:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:31 -0500
commit66cc0b1e214bdac9625eed92e6ac85aa69a11dc8 (patch)
tree6afb501af5308490b189e43d8d3df657d2ddc3ad /source4
parent40cd2d778093d7799b27b6beb37166d8a53f965c (diff)
downloadsamba-66cc0b1e214bdac9625eed92e6ac85aa69a11dc8.tar.gz
samba-66cc0b1e214bdac9625eed92e6ac85aa69a11dc8.tar.bz2
samba-66cc0b1e214bdac9625eed92e6ac85aa69a11dc8.zip
r22952: Make sure we look at extra_cflags when building custom targets.
(This used to be commit 2d990cd37410cec03fa96767b0cf84d7c17ca9c4)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/config.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index e60f51f2d5..3429515025 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -149,9 +149,13 @@ PRIVATE_DEPENDENCIES = \
# End MODULE ldb_tdb
################################################
+# NOTE: this rule is broken for some systems when $builddir != $srcdir because
+# it hardcodes the use of $<. See smb_build/makefile.pm.
./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile
@echo Compiling $<
- @$(CC) -Iinclude $(CFLAGS) -Ilib/replace -Ilib/talloc -Ilib/ldb/include $(PICFLAG) -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@
+ @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \
+ -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
+ -c $< -o $@
################################################
# Start SUBSYSTEM ldb