Rev 12053: Simplify includes for replace. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 12053
revision-id: jelmer at samba.org-20070430103756-32n4enxftkgom39z
parent: svn-v2:22597 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Mon 2007-04-30 12:37:56 +0200
message:
  Simplify includes for replace.
modified:
  source/lib/ldb/Makefile.in     svn-v2:6442 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fldb%2fMakefile.in
  source/lib/replace/Makefile.in svn-v2:18031 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2fMakefile.in
  source/lib/replace/libreplace.m4 svn-v2:18074 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2flibreplace.m4
  source/lib/talloc/Makefile.in  svn-v2:6474 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2ftalloc%2fMakefile.in
  source/lib/tdb/Makefile.in     svn-v2:6546 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2ftdb%2fMakefile.in
=== modified file 'source/lib/ldb/Makefile.in'
--- a/source/lib/ldb/Makefile.in	2007-04-30 08:53:56 +0000
+++ b/source/lib/ldb/Makefile.in	2007-04-30 10:37:56 +0000
@@ -28,7 +28,7 @@
 POPT_CFLAGS = @POPT_CFLAGS@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
-       $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) -I at libreplacedir@ \
+       $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \
 	-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
 
 LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS)

=== modified file 'source/lib/replace/Makefile.in'
--- a/source/lib/replace/Makefile.in	2007-04-15 19:09:34 +0000
+++ b/source/lib/replace/Makefile.in	2007-04-30 10:37:56 +0000
@@ -11,9 +11,9 @@
 builddir = @builddir@
 INSTALL = @INSTALL@
 
-.PHONY: test
+.PHONY: test all showflags install installcheck clean distclean realdistclean
 
-CFLAGS=-I. -I at libreplacedir@ @CFLAGS@
+CFLAGS=-I. @CFLAGS@
 
 OBJS = @LIBREPLACEOBJ@
 

=== modified file 'source/lib/replace/libreplace.m4'
--- a/source/lib/replace/libreplace.m4	2007-04-16 12:43:18 +0000
+++ b/source/lib/replace/libreplace.m4	2007-04-30 10:37:56 +0000
@@ -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 file 'source/lib/talloc/Makefile.in'
--- a/source/lib/talloc/Makefile.in	2007-04-25 14:18:22 +0000
+++ b/source/lib/talloc/Makefile.in	2007-04-30 10:37:56 +0000
@@ -12,7 +12,7 @@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@ -I at libreplacedir@
+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
 EXTRA_TARGETS = @DOC_TARGET@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html

=== modified file 'source/lib/tdb/Makefile.in'
--- a/source/lib/tdb/Makefile.in	2007-04-25 12:58:49 +0000
+++ b/source/lib/tdb/Makefile.in	2007-04-30 10:37:56 +0000
@@ -12,7 +12,7 @@
 VPATH = @srcdir@:@libreplacedir@
 srcdir = @srcdir@
 builddir = @builddir@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I at libreplacedir@
+CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude 
 CFLAGS = $(CPPFLAGS) @CFLAGS@
 LDFLAGS = @LDFLAGS@
 EXEEXT = @EXEEXT@