Makefile changes to protect original compiler flags

Signed-off-by: Gergely Pilisi <gergely.pilisi@ericsson.com>

diff --git a/Makefile.cfg b/Makefile.cfg
index de4fe1f9a07c2c70f1dad08890c1acb71d9fd6d5..edbc42e4476157431d25622fc7165d0a0d58f46d 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -103,7 +103,7 @@ XMLDIR := default
 
 # Flags for the C(++) preprocessor:
 # Prevent a warning about yyinput being defined but not used
-CPPFLAGS := -DYY_NO_INPUT
+CPPFLAGS += -DYY_NO_INPUT
 
 # Flags shared between C and C++
 COMPILERFLAGS := -Wall
@@ -114,10 +114,10 @@ COMPILERFLAGS := -Wall
 
 # Flags for the C compiler.
 # std=gnu9x shuts up warnings about long long and variadic macros
-CCFLAGS = $(COMPILERFLAGS) -std=gnu9x
+CCFLAGS += $(COMPILERFLAGS) -std=gnu9x
 
 # Flags for the C++ compiler:
-CXXFLAGS = $(COMPILERFLAGS) -Wno-long-long
+CXXFLAGS += $(COMPILERFLAGS) -Wno-long-long
 
 # The command for maintaining static libraries:
 AR := ar
@@ -128,7 +128,7 @@ AR := ar
 LD = $(CXX) -shared
 
 # Flags for linking binary executables (e.g. for profiling):
-LDFLAGS = $(MINGW)
+LDFLAGS += $(MINGW)
 
 # The command for removing symbol table from the executables:
 STRIP := strip

diff --git a/loggerplugins/JUnitLogger/Makefile b/loggerplugins/JUnitLogger/Makefile
index 74599aaa8b9a7f6bb90f396f80ad7f009035ccd6..e5f749580ba176140c04ba017fc5b4df0cf27a35 100644 (file)
--- a/loggerplugins/JUnitLogger/Makefile
+++ b/loggerplugins/JUnitLogger/Makefile
@@ -39,10 +39,11 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2
 
 CXXFLAGS += -Werror
 
-LDFLAGS              += -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB).$(MAJOR)              -o $(SHARED_LIB).$(MAJOR).$(MINOR)
-LDFLAGS_RT2          += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR)          -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR)
-LDFLAGS_PARALLEL     += -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR)     -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR)
-LDFLAGS_PARALLEL_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR)
+LDFLAGS_ORIG        := $(LDFLAGS)
+LDFLAGS              += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB).$(MAJOR)              -o $(SHARED_LIB).$(MAJOR).$(MINOR)
+LDFLAGS_RT2          += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR)          -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR)
+LDFLAGS_PARALLEL     += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR)     -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR)
+LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR)
 
 LIBS              := -lttcn3-dynamic
 LIBS_RT2          := -lttcn3-rt2-dynamic

diff --git a/loggerplugins/JUnitLogger2/Makefile b/loggerplugins/JUnitLogger2/Makefile
index 16efc69d6998176a7fcb13655de082bae7078aba..adb083a73f0bffcee46a512c038462c352320e70 100644 (file)
--- a/loggerplugins/JUnitLogger2/Makefile
+++ b/loggerplugins/JUnitLogger2/Makefile
@@ -39,10 +39,11 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2
 
 CXXFLAGS += -Werror
 
-LDFLAGS              += -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB).$(MAJOR)              -o $(SHARED_LIB).$(MAJOR).$(MINOR)
-LDFLAGS_RT2          += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR)          -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR)
-LDFLAGS_PARALLEL     += -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR)     -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR)
-LDFLAGS_PARALLEL_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR)
+LDFLAGS_ORIG        := $(LDFLAGS)
+LDFLAGS              += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB).$(MAJOR)              -o $(SHARED_LIB).$(MAJOR).$(MINOR)
+LDFLAGS_RT2          += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR)          -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR)
+LDFLAGS_PARALLEL     += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR)     -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR)
+LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR)
 
 LIBS              := -lttcn3-dynamic
 LIBS_RT2          := -lttcn3-rt2-dynamic

diff --git a/loggerplugins/TSTLogger/Makefile b/loggerplugins/TSTLogger/Makefile
index e086bb0558fedce10becad9f574ad67e02001df8..8c46ce63cfc502320f40410250a31ffc6cf27650 100644 (file)
--- a/loggerplugins/TSTLogger/Makefile
+++ b/loggerplugins/TSTLogger/Makefile
@@ -39,10 +39,11 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2
 
 CXXFLAGS += -Werror
 
-LDFLAGS              += -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB).$(MAJOR)              -o $(SHARED_LIB).$(MAJOR).$(MINOR)
-LDFLAGS_RT2          += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR)          -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR)
-LDFLAGS_PARALLEL     += -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR)     -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR)
-LDFLAGS_PARALLEL_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR)
+LDFLAGS_ORIG        := $(LDFLAGS)
+LDFLAGS              += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB).$(MAJOR)              -o $(SHARED_LIB).$(MAJOR).$(MINOR)
+LDFLAGS_RT2          += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR)          -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR)
+LDFLAGS_PARALLEL     += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core  -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR)     -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR)
+LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR)
 
 LIBS              := -lttcn3-dynamic
 LIBS_RT2          := -lttcn3-rt2-dynamic