Index: libopencsd-0.8.1/decoder/build/linux/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/build/linux/makefile
+++ libopencsd-0.8.1/decoder/build/linux/makefile
@@ -76,28 +76,28 @@ INSTALL_LIB_DIR=$(PREFIX)/lib/$(DEB_HOST
 export INSTALL_INCLUDE_DIR=$(PREFIX)/include
 
 # compile flags
-MASTER_CC_FLAGS := -c -Wall -DLINUX
-MASTER_CXX_FLAGS := -c -Wall -DLINUX -std=c++11
-MASTER_LINKER_FLAGS := -Wl,-z,defs
-MASTER_LIB_FLAGS := rcs
+CFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -fpic
+CXXFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -fpic -std=c++11
+LDFLAGS += -Wl,-z,defs
+ARFLAGS ?= rcs
 
 # debug variant
 ifdef DEBUG
-MASTER_CC_FLAGS += -g -O0 -DDEBUG
-MASTER_CXX_FLAGS += -g -O0 -DDEBUG
+CFLAGS += -g -O0 -DDEBUG
+CXXFLAGS += -g -O0 -DDEBUG
 BUILD_VARIANT=dbg
 else
-MASTER_CC_FLAGS += -g -O2 -DNDEBUG
-MASTER_CXX_FLAGS += -g -O2 -DNDEBUG
+CFLAGS += -g -O2 -DNDEBUG
+CXXFLAGS += -g -O2 -DNDEBUG
 BUILD_VARIANT=rel
 endif
 
 
 # export build flags
-export MASTER_CC_FLAGS
-export MASTER_CXX_FLAGS
-export MASTER_LINKER_FLAGS
-export MASTER_LIB_FLAGS
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
+export ARFLAGS
 
 # target directories
 export PLAT_DIR=builddir
Index: libopencsd-0.8.1/decoder/build/linux/rctdl_c_api_lib/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/build/linux/rctdl_c_api_lib/makefile
+++ libopencsd-0.8.1/decoder/build/linux/rctdl_c_api_lib/makefile
@@ -34,10 +34,6 @@ CXX := $(MASTER_CXX)
 LINKER := $(MASTER_LINKER)
 LIB := $(MASTER_LIB)
 
-CXX_FLAGS := $(MASTER_CXX_FLAGS) -fpic -Wno-switch
-LIB_FLAGS := $(MASTER_LIB_FLAGS)
-LINKER_FLAGS := $(MASTER_LINKER_FLAGS) -shared
-
 LIB_NAME = lib$(LIB_CAPI_NAME)
 SO_LIB_DEPS= -L$(LIB_TARGET_DIR) -l$(LIB_BASE_NAME)
 
@@ -69,10 +65,10 @@ $(BUILD_DIR):
 	mkdir $(BUILD_DIR)
 
 $(LIB_TARGET_DIR)/$(LIB_NAME).a: $(OBJECTS) | $(BUILD_DIR) $(LIB_TARGET_DIR)
-	$(LIB) $(LIB_FLAGS) $(LIB_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
+	$(LIB) $(ARFLAGS) $(LIB_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
 
 $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_VER): $(OBJECTS) | $(BUILD_DIR) $(LIB_TARGET_DIR)
-	$(LINKER) $(LINKER_FLAGS) -o $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_VER) -Wl,-soname,$(LIB_NAME).so.$(SO_MAJOR_VER) $(OBJECTS) $(SO_LIB_DEPS)
+	$(LINKER) $(LDFLAGS) -shared -o $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_VER) -Wl,-soname,$(LIB_NAME).so.$(SO_MAJOR_VER) $(OBJECTS) $(SO_LIB_DEPS)
 
 $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_MAJOR_VER): $(LIBS) | $(LIB_TARGET_DIR)
 	( cd $(LIB_TARGET_DIR); ln -s $(LIB_NAME).so.$(SO_VER) $(LIB_NAME).so.$(SO_MAJOR_VER) )
@@ -90,7 +86,7 @@ DEPS := $(OBJECTS:%.o=%.d)
 
 ## object compile
 $(BUILD_DIR)/%.o : %.cpp
-	$(CXX) $(CXX_FLAGS) $(CXX_INCLUDES) -MMD $< -o $@
+	$(CXX) $(CXXFLAGS) $(CXX_INCLUDES) -MMD $< -o $@
 
 
 #### clean
Index: libopencsd-0.8.1/decoder/build/linux/ref_trace_decode_lib/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/build/linux/ref_trace_decode_lib/makefile
+++ libopencsd-0.8.1/decoder/build/linux/ref_trace_decode_lib/makefile
@@ -128,10 +128,10 @@ $(BUILD_DIR):
 	mkdir $(BUILD_DIR)
 
 $(LIB_TARGET_DIR)/$(LIB_NAME).a: $(OBJECTS) | $(BUILD_DIR) $(LIB_TARGET_DIR)
-	$(LIB) $(LIB_FLAGS) $(LIB_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
+	$(LIB) $(ARFLAGS) $(LIB_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
 
 $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_VER): $(OBJECTS) | $(BUILD_DIR) $(LIB_TARGET_DIR)
-	$(LINKER) $(LINKER_FLAGS) -o $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_VER) -Wl,-soname,$(LIB_NAME).so.$(SO_MAJOR_VER) $(OBJECTS)
+	$(LINKER) $(LDFLAGS) -shared -o $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_VER) -Wl,-soname,$(LIB_NAME).so.$(SO_MAJOR_VER) $(OBJECTS)
 
 $(LIB_TARGET_DIR)/$(LIB_NAME).so.$(SO_MAJOR_VER): $(LIBS) | $(LIB_TARGET_DIR)
 	( cd $(LIB_TARGET_DIR); ln -s $(LIB_NAME).so.$(SO_VER) $(LIB_NAME).so.$(SO_MAJOR_VER) )
@@ -149,7 +149,7 @@ DEPS := $(OBJECTS:%.o=%.d)
 
 ## object compile
 $(BUILD_DIR)/%.o : %.cpp
-	$(CXX) $(CXX_FLAGS) $(CXX_INCLUDES) -MMD  $< -o $@
+	$(CXX) $(CXXFLAGS) $(CXX_INCLUDES) -MMD  $< -o $@
 
 
 #### clean
Index: libopencsd-0.8.1/decoder/tests/build/linux/c_api_pkt_print_test/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/tests/build/linux/c_api_pkt_print_test/makefile
+++ libopencsd-0.8.1/decoder/tests/build/linux/c_api_pkt_print_test/makefile
@@ -33,9 +33,7 @@
 #
 
 CC := $(MASTER_CC)
-CC_FLAGS := $(MASTER_CC_FLAGS) -Wno-switch
 LINKER := $(MASTER_LINKER)	
-LINKER_FLAGS := $(MASTER_LINKER_FLAGS) 
 
 PROG = c_api_pkt_print_test
 
@@ -60,7 +58,7 @@ test_app: 	$(OBJECTS) $(BIN_TEST_TARGET_
 
  $(BIN_TEST_TARGET_DIR)/$(PROG):
 			mkdir -p  $(BIN_TEST_TARGET_DIR)
-			$(LINKER) $(LINKER_FLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group -o $(BIN_TEST_TARGET_DIR)/$(PROG)
+			$(LINKER) $(LDFLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group -o $(BIN_TEST_TARGET_DIR)/$(PROG)
 			cp $(LIB_TARGET_DIR)/*.so .
 
 build_dir:
@@ -81,7 +79,7 @@ DEPS := $(OBJECTS:%.o=%.d)
 
 ## object compile
 $(BUILD_DIR)/%.o : %.c
-			$(CC) $(CC_FLAGS) $(CC_INCLUDES) -MMD $< -o $@ 
+			$(CC) $(CFLAGS) $(CC_INCLUDES) -MMD $< -o $@
 
 #### clean
 .PHONY: clean
Index: libopencsd-0.8.1/decoder/tests/build/linux/echo_test_dcd_lib/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/tests/build/linux/echo_test_dcd_lib/makefile
+++ libopencsd-0.8.1/decoder/tests/build/linux/echo_test_dcd_lib/makefile
@@ -31,13 +31,8 @@
 #
 
 CC := $(MASTER_CC)
-LINKER := $(MASTER_LINKER)	
 LIB := $(MASTER_LIB)
 
-CC_FLAGS := $(MASTER_CC_FLAGS) -fpic -Wno-switch
-LIB_FLAGS := $(MASTER_LIB_FLAGS)
-LINKER_FLAGS := $(MASTER_LINKER_FLAGS) -shared
-
 LIB_NAME = lib_echo_test_dcd
 
 BUILD_DIR=./$(PLAT_DIR)
@@ -57,7 +52,7 @@ all:  build_dir  $(OBJECTS) $(LIB_TEST_T
 
 $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a:
 	mkdir -p $(LIB_TEST_TARGET_DIR)
-	$(LIB) $(LIB_FLAGS) $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
+	$(LIB) $(ARFLAGS) $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
 
 build_dir:
 	mkdir -p $(BUILD_DIR)
@@ -76,7 +71,7 @@ DEPS := $(OBJECTS:%.o=%.d)
 
 ## object compile
 $(BUILD_DIR)/%.o : %.c
-			$(CC) $(CC_FLAGS) $(CC_INCLUDES) -MMD $< -o $@ 
+			$(CC) $(CFLAGS) $(CC_INCLUDES) -MMD $< -o $@
 
 #### clean
 .PHONY: clean
Index: libopencsd-0.8.1/decoder/tests/build/linux/snapshot_parser_lib/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/tests/build/linux/snapshot_parser_lib/makefile
+++ libopencsd-0.8.1/decoder/tests/build/linux/snapshot_parser_lib/makefile
@@ -39,8 +39,7 @@ LIB := $(MASTER_LIB)
 # avoid build warnings in donated test code
 WSUPPRESS= -Wno-deprecated-declarations -Wno-unused-variable -Wno-reorder
 
-CXX_FLAGS := $(MASTER_CXX_FLAGS) -fpic -Wno-switch $(WSUPPRESS)
-LIB_FLAGS := $(MASTER_LIB_FLAGS)
+CXXFLAGS += $(WSUPPRESS)
 
 LIB_NAME = libsnapshot_parser
 
@@ -68,7 +67,7 @@ all: build_dir $(OBJECTS) $(LIB_TEST_TAR
 
 $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a:
 	mkdir -p $(LIB_TEST_TARGET_DIR)
-	$(LIB) $(LIB_FLAGS) $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
+	$(LIB) $(ARFLAGS) $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a $(OBJECTS)
 
 build_dir:
 	mkdir -p $(BUILD_DIR)
@@ -82,7 +81,7 @@ DEPS := $(OBJECTS:%.o=%.d)
 
 ## object compile
 $(BUILD_DIR)/%.o : %.cpp
-	$(CXX) $(CXX_FLAGS) $(CXX_INCLUDES) -MMD $< -o $@
+	$(CXX) $(CXXFLAGS) $(CXX_INCLUDES) -MMD $< -o $@
 
 ### clean
 .PHONY: clean
Index: libopencsd-0.8.1/decoder/tests/build/linux/trc_pkt_lister/makefile
===================================================================
--- libopencsd-0.8.1.orig/decoder/tests/build/linux/trc_pkt_lister/makefile
+++ libopencsd-0.8.1/decoder/tests/build/linux/trc_pkt_lister/makefile
@@ -33,9 +33,7 @@
 #
 
 CXX := $(MASTER_CXX)
-CXX_FLAGS := $(MASTER_CXX_FLAGS) -Wno-switch
-LINKER := $(MASTER_LINKER)	
-LINKER_FLAGS := $(MASTER_LINKER_FLAGS) 
+LINKER := $(MASTER_LINKER)
 
 PROG = trc_pkt_lister
 
@@ -60,7 +58,7 @@ test_app: 	$(OBJECTS) $(BIN_TEST_TARGET_
 
  $(BIN_TEST_TARGET_DIR)/$(PROG):
 			mkdir -p  $(BIN_TEST_TARGET_DIR)
-			$(LINKER) $(LINKER_FLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group -o $(BIN_TEST_TARGET_DIR)/$(PROG)
+			$(LINKER) $(LDFLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group -o $(BIN_TEST_TARGET_DIR)/$(PROG)
 
 build_dir:
 	mkdir -p $(BUILD_DIR)
@@ -80,7 +78,7 @@ DEPS := $(OBJECTS:%.o=%.d)
 
 ## object compile
 $(BUILD_DIR)/%.o : %.cpp
-			$(CXX) $(CXX_FLAGS) $(CXX_INCLUDES) -MMD $< -o $@
+			$(CXX) $(CXXFLAGS) $(CXX_INCLUDES) -MMD $< -o $@
 
 #### clean
 .PHONY: clean