summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--events/Makefile.in2
-rw-r--r--ldb/Makefile.in4
-rw-r--r--replace/Makefile.in4
-rw-r--r--server/Makefile.in2
-rw-r--r--talloc/Makefile.in2
-rw-r--r--tdb/Makefile.in6
6 files changed, 10 insertions, 10 deletions
diff --git a/events/Makefile.in b/events/Makefile.in
index 42571198..bd1e65ce 100644
--- a/events/Makefile.in
+++ b/events/Makefile.in
@@ -39,7 +39,7 @@ EVENTS_CFLAGS = @EVENTS_CFLAGS@
EVENTS_LDFLAGS = @EVENTS_CFLAGS@
EVENTS_LIBS = @EVENTS_LIBS@
-CFLAGS = $(CPPFLAGS) $(TALLOC_CFLAGS) $(EVENTS_CFLAGS) @CFLAGS@
+CFLAGS += $(CPPFLAGS) $(TALLOC_CFLAGS) $(EVENTS_CFLAGS) @CFLAGS@
LDFLAGS = $(TALLOC_LDFLAGS) $(EVENTS_LDFLAGS) @LDFLAGS@
LIBS = $(TALLOC_LIBS) $(EVENTS_LIBS) @LIBS@
diff --git a/ldb/Makefile.in b/ldb/Makefile.in
index 8d95dae7..b8010150 100644
--- a/ldb/Makefile.in
+++ b/ldb/Makefile.in
@@ -51,11 +51,11 @@ LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS += @LDFLAGS@
LIBS = @LIBS@
PICFLAG = @PICFLAG@
-CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
+CFLAGS += -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(EVENTS_CFLAGS) \
-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@
diff --git a/replace/Makefile.in b/replace/Makefile.in
index 65f8125e..0986d601 100644
--- a/replace/Makefile.in
+++ b/replace/Makefile.in
@@ -15,8 +15,8 @@ LIBS = @LIBS@
.PHONY: test all showflags install installcheck clean distclean realdistclean
-CFLAGS=-I. @CFLAGS@
-LDFLAGS=@LDFLAGS@
+CFLAGS += -I. @CFLAGS@
+LDFLAGS += @LDFLAGS@
OBJS = @LIBREPLACEOBJ@
diff --git a/server/Makefile.in b/server/Makefile.in
index 724cb047..34be39b3 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -38,7 +38,7 @@ LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS += @LDFLAGS@
LIBS = @LIBS@ $(TALLOC_LIBS) $(TDB_LIBS) $(EVENTS_LIBS) $(POPT_LIBS)
PICFLAG = @PICFLAG@
diff --git a/talloc/Makefile.in b/talloc/Makefile.in
index c28693e2..586a6164 100644
--- a/talloc/Makefile.in
+++ b/talloc/Makefile.in
@@ -13,7 +13,7 @@ sharedbuilddir = @sharedbuilddir@
XSLTPROC = @XSLTPROC@
INSTALLCMD = @INSTALL@
CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@
+CFLAGS += @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@
EXTRA_TARGETS = @DOC_TARGET@
PICFLAG = @PICFLAG@
PACKAGE_VERSION = @PACKAGE_VERSION@
diff --git a/tdb/Makefile.in b/tdb/Makefile.in
index 9915d882..a9ffc3e5 100644
--- a/tdb/Makefile.in
+++ b/tdb/Makefile.in
@@ -14,9 +14,9 @@ srcdir = @srcdir@
builddir = @builddir@
sharedbuilddir = @sharedbuilddir@
INSTALLCMD = @INSTALL@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude
-CFLAGS = $(CPPFLAGS) @CFLAGS@
-LDFLAGS = @LDFLAGS@
+CPPFLAGS += @CPPFLAGS@ -I$(srcdir)/include -Iinclude
+CFLAGS += $(CPPFLAGS) @CFLAGS@
+LDFLAGS += @LDFLAGS@
EXEEXT = @EXEEXT@
SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@