From 36c304580b49ea6ce445a68ac77b08405b983275 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 4 Oct 2008 11:13:48 -0400
Subject: Make it possible to pass extra CFLAGS and LDFLAGS by passing them on
 the command line before calling makefiles

---
 events/Makefile.in  | 2 +-
 ldb/Makefile.in     | 4 ++--
 replace/Makefile.in | 4 ++--
 server/Makefile.in  | 2 +-
 talloc/Makefile.in  | 2 +-
 tdb/Makefile.in     | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/events/Makefile.in b/events/Makefile.in
index 425711984..bd1e65ce2 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 8d95dae7e..b8010150a 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 65f8125ef..0986d601a 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 724cb0473..34be39b35 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 c28693e2d..586a61642 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 9915d8826..a9ffc3e56 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@
-- 
cgit