Author: jelmer Date: 2007-04-30 09:38:25 +0000 (Mon, 30 Apr 2007) New Revision: 22598
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22598 Log: Simplify includes for replace. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/replace/Makefile.in branches/SAMBA_4_0/source/lib/replace/libreplace.m4 branches/SAMBA_4_0/source/lib/talloc/Makefile.in branches/SAMBA_4_0/source/lib/tdb/Makefile.in Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:merge ...skipped... Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-04-30 09:35:32 UTC (rev 22597) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-04-30 09:38:25 UTC (rev 22598) @@ -28,7 +28,7 @@ POPT_CFLAGS = @POPT_CFLAGS@ CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ - $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) [EMAIL PROTECTED]@ \ + $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \ -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@[EMAIL PROTECTED]" -DUSE_MMAP=1 @CFLAGS@ [EMAIL PROTECTED]@ -Llib -lldb @LIBS@ $(POPT_LIBS) Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/replace/Makefile.in 2007-04-30 09:35:32 UTC (rev 22597) +++ branches/SAMBA_4_0/source/lib/replace/Makefile.in 2007-04-30 09:38:25 UTC (rev 22598) @@ -11,9 +11,9 @@ builddir = @builddir@ INSTALL = @INSTALL@ -.PHONY: test +.PHONY: test all showflags install installcheck clean distclean realdistclean -CFLAGS=-I. [EMAIL PROTECTED]@ @CFLAGS@ +CFLAGS=-I. @CFLAGS@ OBJS = @LIBREPLACEOBJ@ Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-04-30 09:35:32 UTC (rev 22597) +++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-04-30 09:38:25 UTC (rev 22598) @@ -354,6 +354,7 @@ AC_LIBREPLACE_CC_CHECKS AC_LIBREPLACE_BROKEN_CHECKS AC__LIBREPLACE_ALL_CHECKS_END +CFLAGS="$CFLAGS -I$libreplacedir" ]) m4_include(libreplace_cc.m4) Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/Makefile.in 2007-04-30 09:35:32 UTC (rev 22597) +++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in 2007-04-30 09:38:25 UTC (rev 22598) @@ -12,7 +12,7 @@ XSLTPROC = @XSLTPROC@ INSTALLCMD = @INSTALL@ CC = @CC@ -CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ +CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. [EMAIL PROTECTED]@ EXTRA_TARGETS = @DOC_TARGET@ .SUFFIXES: .c .o .3 .3.xml .xml .html Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2007-04-30 09:35:32 UTC (rev 22597) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2007-04-30 09:38:25 UTC (rev 22598) @@ -12,7 +12,7 @@ VPATH = @srcdir@:@libreplacedir@ srcdir = @srcdir@ builddir = @builddir@ -CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude [EMAIL PROTECTED]@ +CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude CFLAGS = $(CPPFLAGS) @CFLAGS@ LDFLAGS = @LDFLAGS@ EXEEXT = @EXEEXT@
