diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-04-30 09:38:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:49 -0500 |
| commit | 2ea189659172ef49684bcd0a716ae2fffcd538ef (patch) | |
| tree | 611617dcd7ace2c174d6a82bf63c72054fc60bb1 | |
| parent | 201408141d4f6be501a38315d615671ccf7613f3 (diff) | |
| download | samba-2ea189659172ef49684bcd0a716ae2fffcd538ef.tar.gz samba-2ea189659172ef49684bcd0a716ae2fffcd538ef.tar.bz2 samba-2ea189659172ef49684bcd0a716ae2fffcd538ef.zip | |
r22598: Simplify includes for replace.
(This used to be commit e72cec408e832e0f6ce05c38febdd56de501dbf7)
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 2 | ||||
| -rw-r--r-- | source4/lib/replace/Makefile.in | 4 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/talloc/Makefile.in | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/Makefile.in | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index d971581c41..df86b9988c 100644 --- 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 f4c79749a6..41454f6ec4 100644 --- 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 e9b19b7cf5..fa00f2c1c4 100644 --- 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 e4737f0423..c6aa40cde2 100644 --- 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 8904fde437..6bdfba2354 100644 --- 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@ |