svn commit: samba r22952 - in branches/SAMBA_4_0/source/lib/ldb: .

[jpeach at samba.org]

Author: jpeach
Date: 2007-05-16 19:23:08 +0000 (Wed, 16 May 2007)
New Revision: 22952

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22952

Log:
Make sure we look at extra_cflags when building custom targets.

Modified:
   branches/SAMBA_4_0/source/lib/ldb/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk	2007-05-16 17:30:00 UTC (rev 22951)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk	2007-05-16 19:23:08 UTC (rev 22952)
@@ -149,9 +149,13 @@
 # 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