r22598: Simplify includes for replace.

(This used to be commit e72cec408e832e0f6ce05c38febdd56de501dbf7)

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index d971581c41ee27a522c812f7d42714150ce54f5c..df86b9988c4ddf5c7ef0bbed1ece4e5c6522a7a5 100644 (file)
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -28,7 +28,7 @@ POPT_LIBS = @POPT_LIBS@
 POPT_CFLAGS = @POPT_CFLAGS@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
-       $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
+       $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \
        -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
 
 LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS)

diff --git a/source4/lib/replace/Makefile.in b/source4/lib/replace/Makefile.in
index f4c79749a69ca03c0b9f076f3bdc6c048437b550..41454f6ec42322af783e511661bd1beec22fa988 100644 (file)
--- a/source4/lib/replace/Makefile.in
+++ b/source4/lib/replace/Makefile.in
@@ -11,9 +11,9 @@ srcdir = @srcdir@
 builddir = @builddir@
 INSTALL = @INSTALL@
 
-.PHONY: test
+.PHONY: test all showflags install installcheck clean distclean realdistclean
 
-CFLAGS=-I. -I@libreplacedir@ @CFLAGS@
+CFLAGS=-I. @CFLAGS@
 
 OBJS = @LIBREPLACEOBJ@
 

diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index e9b19b7cf51b45bdf38ba81941de5a8c806a346c..fa00f2c1c474d14676c2ec378d18d162e5ef96e9 100644 (file)
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -354,6 +354,7 @@ AC_LIBREPLACE_LOCATION_CHECKS
 AC_LIBREPLACE_CC_CHECKS
 AC_LIBREPLACE_BROKEN_CHECKS
 AC__LIBREPLACE_ALL_CHECKS_END
+CFLAGS="$CFLAGS -I$libreplacedir"
 ])
 
 m4_include(libreplace_cc.m4)

diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index e4737f04231aa54ece10e398649cb42f1512cc18..c6aa40cde22ac0b24e51428e4a175f9cc4f526b5 100644 (file)
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -12,7 +12,7 @@ builddir = @builddir@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@ -I@libreplacedir@
+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@
 EXTRA_TARGETS = @DOC_TARGET@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html

diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 8904fde4375b9da774a19a8aaaa6b810d5fe312f..6bdfba2354dcddf2870e578a963db47a8c478d60 100644 (file)
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -12,7 +12,7 @@ libdir = @libdir@
 VPATH = @srcdir@:@libreplacedir@
 srcdir = @srcdir@
 builddir = @builddir@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I@libreplacedir@
+CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude 
 CFLAGS = $(CPPFLAGS) @CFLAGS@
 LDFLAGS = @LDFLAGS@
 EXEEXT = @EXEEXT@