From 2396691d0d720cffab43bd8a8b9c2b1d5b838723 Mon Sep 17 00:00:00 2001
From: Eric Petit <eric@lapsus.org>
Date: Wed, 12 Apr 2006 22:09:54 +0000
Subject: [PATCH] The CFLAGS/LDFLAGS passed to configure are now put at the end
 at the compile line, so our default settings (esp for -O) can be overridden

---
 Makefile.common | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index e5ca961ad..f3fd612ca 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -2,39 +2,42 @@ VERSION_MAJOR  = 0
 VERSION_MINOR  = 5
 VERSION_STRING = 0.6-svn
 
-RM        = rm -Rf
-MOREFLAGS = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
-            -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
-            -DVERSION_MAJOR=$(VERSION_MAJOR) \
-            -DVERSION_MINOR=$(VERSION_MINOR) \
-            -DVERSION_STRING=\"$(VERSION_STRING)\" \
-            -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
-CFLAGS   += $(MOREFLAGS)
-CXXFLAGS += $(MOREFLAGS)
+TMPCFLAGS   = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
+              -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
+              -DVERSION_MAJOR=$(VERSION_MAJOR) \
+              -DVERSION_MINOR=$(VERSION_MINOR) \
+              -DVERSION_STRING=\"$(VERSION_STRING)\" \
+              -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
+TMPCXXFLAGS = $(TMPCFLAGS)
+TMPLDFLAGS  =
 
 ifeq ($(SYSTEM),BeOS)
-CXXFLAGS += -Wno-multichar
+TMPCXXFLAGS += -Wno-multichar
 ifeq ($(BEOS_NETSERVER),yes)
-CFLAGS  += -DBEOS_NETSERVER
-LDFLAGS += -lnet
+TMPCFLAGS  += -DBEOS_NETSERVER
+TMPLDFLAGS += -lnet
 else
-LDFLAGS += -lbind -lsocket
+TMPLDFLAGS += -lbind -lsocket
 endif
 endif
 
 ifeq ($(PTHREAD),yes)
 ifeq ($(SYSTEM),FreeBSD)
-LDFLAGS += -pthread
+TMPLDFLAGS += -pthread
 else
-LDFLAGS += -lpthread
+TMPLDFLAGS += -lpthread
 endif
 endif
 
 ifeq ($(OPENSSL),yes)
-CFLAGS  += -DHAVE_OPENSSL
-LDFLAGS += -lcrypto
+TMPCFLAGS  += -DHAVE_OPENSSL
+TMPLDFLAGS += -lcrypto
 endif
 
+CFLAGS   := $(TMPCFLAGS) $(CFLAGS)
+CXXFLAGS := $(TMPCXXFLAGS) $(CXXFLAGS)
+LDFLAGS  := $(TMPLDFLAGS) $(LDFLAGS)
+
 #
 # Utils
 #
@@ -57,4 +60,5 @@ define LINK_RULE
 	  ( echo "Compile line for $@ was:"; echo $$CMD; false )
 endef
 
+RM    = rm -Rf
 MAKE += --no-print-directory