diff --git a/make/defs.mk b/make/defs.mk index 5b2c97a6..36e10ec4 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -117,9 +117,9 @@ else endif endif -CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\" -CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" -LDFLAGS += -Wall +BUILD_CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\" +BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" +BUILD_LDFLAGS += -Wall ifneq ($(LOG_QUAL_PREFIX),) PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" @@ -127,8 +127,8 @@ PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\ endif ifeq ($(CATCH_ONLY_YERROR),true) -CFLAGS += -DCATCH_ONLY_YERROR -CPPFLAGS += -DCATCH_ONLY_YERROR +BUILD_CFLAGS += -DCATCH_ONLY_YERROR +BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR endif ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) @@ -140,8 +140,8 @@ SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) endif OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid -CFLAGS += -DVERSION=$(HEX_VERSION) -CPPFLAGS += -DVERSION=$(HEX_VERSION) +BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) +BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) ifeq ($(TARGET),mingw) CROSS_TOOL_DIR ?= /opt/cross-tools @@ -152,7 +152,7 @@ STRIP = $(CROSS_TOOL_BIN_PREFIX)strip RANLIB = $(CROSS_TOOL_BIN_PREFIX)ranlib AR = $(CROSS_TOOL_BIN_PREFIX)ar WINDRES = $(CROSS_TOOL_BIN_PREFIX)windres -LDFLAGS += -lws2_32 +BUILD_LDFLAGS += -lws2_32 USE_GFILTER = false MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE LD = $(GPP) @@ -445,15 +445,15 @@ endif # == ifeq ($(DEVELOPMENT),true) - CFLAGS += -D_DEVELOPMENT_ - CPPFLAGS += -D_DEVELOPMENT_ + BUILD_CFLAGS += -D_DEVELOPMENT_ + BUILD_CPPFLAGS+= -D_DEVELOPMENT_ endif CORE += $(wildcard core core.* vgcore vgcore.*) ifeq ($(GCC_MAJOR),4) - CFLAGS += -DGCC_HASCLASSVISIBILITY - CPPFLAGS += -DGCC_HASCLASSVISIBILITY + BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY + BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY endif ifeq ($(USE_QT),true) @@ -462,24 +462,24 @@ endif ifeq ($(USE_X),true) ifeq ($(ARCH),x86) - LDFLAGS += -L/usr/X11/lib -lXext -lX11 + BUILD_LDFLAGS += -L/usr/X11/lib -lXext -lX11 else - LDFLAGS += -L/usr/X11/lib64 -lXext -lX11 + BUILD_LDFLAGS += -L/usr/X11/lib64 -lXext -lX11 endif endif LPPFLAGS += -lstdc++ ifeq ($(ARCH),x86_64) - CFLAGS += -fPIC - CPPFLAGS += -fPIC + BUILD_CFLAGS += -fPIC + BUILD_CPPFLAGS+= -fPIC LIBFLAGS += endif ifeq ($(GCC_MAJOR),2) LPPFLAGS += -lm -CFLAGS += -I/usr/local/include -CPPFLAGS += -I/usr/local/include +BUILD_CFLAGS += -I/usr/local/include +BUILD_CPPFLAGS += -I/usr/local/include else ifeq ($(GCC_MAJOR),3) ifeq ($(GCC_MINOR),3) @@ -491,7 +491,7 @@ endif ifeq ($(LIBTYPE),shared) ifneq ($(TARGET),mingw) - LDFLAGS += -rdynamic + BUILD_LDFLAGS += -rdynamic endif endif @@ -503,8 +503,8 @@ RM = rm AR = ar ifeq ($(LOG_THREAD_NAMES), true) - CFLAGS += -DSLOG_THREAD_NAMES - CPPFLAGS += -DSLOG_THREAD_NAMES + BUILD_CFLAGS += -DSLOG_THREAD_NAMES + BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES endif ifdef INSTALL_LOG @@ -606,20 +606,20 @@ ifeq ($(USE_YTOOLS),true) endif ifeq ($(USE_TIMER),true) - CFLAGS += -D_USE_TIMER_ - CPPFLAGS += -D_USE_TIMER_ + BUILD_CFLAGS+= -D_USE_TIMER_ + BUILD_CPPFLAGS += -D_USE_TIMER_ endif ifeq ($(USE_GCOV),true) - CFLAGS += --coverage - CPPFLAGS += --coverage - LDFLAGS += --coverage + BUILD_CFLAGS+= --coverage + BUILD_CPPFLAGS += --coverage + BUILD_LDFLAGS += --coverage endif ifeq ($(USE_PROFILER),true) - CFLAGS += -pg - CPPFLAGS += -pg - LDFLAGS += -pg + BUILD_CFLAGS+= -pg + BUILD_CPPFLAGS += -pg + BUILD_LDFLAGS += -pg endif ifeq ($(USE_YAMD),true) @@ -627,91 +627,91 @@ ifeq ($(USE_YAMD),true) endif ifeq ($(USE_MPATROL),true) - CFLAGS += -include /usr/include/mpatrol.h - #CPPFLAGS += -include /usr/include/mpatrol.h - LDFLAGS += -lmpatrolmt -lbfd -liberty + BUILD_CFLAGS+= -include /usr/include/mpatrol.h + #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h + BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(USE_VALGRIND),true) - #CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ - #CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ - # LDFLAGS += + #BUILD_CFLAGS+= -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ + #BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ + # BUILD_LDFLAGS += endif ifeq ($(USE_STACK_PROTECTOR),true) - CFLAGS += -fstack-protector-all -# CFLAGS += -fstack-protector + BUILD_CFLAGS+= -fstack-protector-all +# BUILD_CFLAGS+= -fstack-protector endif ifeq ($(USE_DBMALLOC),true) CONTRIB_LIBS += dbmalloc - CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc - CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc - LDFLAGS += -ldbmalloc + BUILD_CFLAGS+= -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc + BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc + BUILD_LDFLAGS += -ldbmalloc endif ifeq ($(USE_DMALLOC),true) - CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT - CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT - LDFLAGS += -ldmallocthcxx -ldmallocth + BUILD_CFLAGS+= -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT + BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT + BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth endif ifeq ($(USE_MEMWATCH),true) - CFLAGS += -DMEMWATCH -DMW_STDIO - CPPFLAGS += -DMEMWATCH -DMW_STDIO + BUILD_CFLAGS+= -DMEMWATCH -DMW_STDIO + BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO endif ifeq ($(USE_EFENCE),true) - CFLAGS += -DEFENCE - CPPFLAGS += -DEFENCE - LDFLAGS += -lefence + BUILD_CFLAGS+= -DEFENCE + BUILD_CPPFLAGS += -DEFENCE + BUILD_LDFLAGS += -lefence endif ifeq ($(USE_TRACING),true) - CFLAGS += -D_DO_TRACE_ - CPPFLAGS += -D_DO_TRACE_ + BUILD_CFLAGS+= -D_DO_TRACE_ + BUILD_CPPFLAGS += -D_DO_TRACE_ endif ifeq ($(USE_ASSERTIONS),false) - CFLAGS += -DNDEBUG - CPPFLAGS += -DNDEBUG + BUILD_CFLAGS+= -DNDEBUG + BUILD_CPPFLAGS += -DNDEBUG endif ifeq ($(COMPILE_DEBUG_CODE),true) - CFLAGS += -D_DEBUG_ - CPPFLAGS += -D_DEBUG_ + BUILD_CFLAGS+= -D_DEBUG_ + BUILD_CPPFLAGS += -D_DEBUG_ endif ifeq ($(COMPILE_DEBUG_LOG),true) - CFLAGS += -D_LOG_DEBUG_ - CPPFLAGS += -D_LOG_DEBUG_ + BUILD_CFLAGS+= -D_LOG_DEBUG_ + BUILD_CPPFLAGS += -D_LOG_DEBUG_ endif ifeq ($(USE_MPATROL),true) - CFLAGS += -include $(MODDIR)/include/mpatrol.h - CPPFLAGS += -include $(MODDIR)/include/mpatrol.h - LDFLAGS += -lmpatrolmt -lbfd -liberty + BUILD_CFLAGS+= -include $(MODDIR)/include/mpatrol.h + BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h + BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(BREAK_ABI),true) - CFLAGS += -D_BREAK_ABI_ - CPPFLAGS += -D_BREAK_ABI_ + BUILD_CFLAGS+= -D_BREAK_ABI_ + BUILD_CPPFLAGS += -D_BREAK_ABI_ endif ifeq ($(USE_STACK_CHECK),true) - CFLAGS += -fstack-check - CPPFLAGS += -fstack-check + BUILD_CFLAGS+= -fstack-check + BUILD_CPPFLAGS += -fstack-check endif ifeq ($(USE_COMPILER_DEBUG_OPTS),true) - CFLAGS += -g3 -ggdb - CPPFLAGS += -g3 -ggdb - LDFLAGS += -g3 -ggdb + BUILD_CFLAGS+= -g3 -ggdb + BUILD_CPPFLAGS += -g3 -ggdb + BUILD_LDFLAGS += -g3 -ggdb endif ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) - CFLAGS += -funroll-loops -O2 - CPPFLAGS += -funroll-loops -O2 + BUILD_CFLAGS+= -funroll-loops -O2 + BUILD_CPPFLAGS += -funroll-loops -O2 else NO_OPT_FLAGS = \ -fno-inline-functions-called-once \ @@ -731,14 +731,14 @@ else -fno-inline-functions-called-once \ -fno-inline-functions \ -fno-early-inlining - CFLAGS += $(NO_OPT_FLAGS) - CPPFLAGS += $(NO_OPT_FLAGS) - LDFLAGS += $(NO_OPT_FLAGS) + BUILD_CFLAGS+= $(NO_OPT_FLAGS) + BUILD_CPPFLAGS += $(NO_OPT_FLAGS) + BUILD_LDFLAGS += $(NO_OPT_FLAGS) endif ifeq ($(USE_EXCEPTIONS_IN_C),true) - CFLAGS += -fexceptions - LDFLAGS += -shared-libgcc + BUILD_CFLAGS+= -fexceptions + BUILD_LDFLAGS += -shared-libgcc endif ifeq ($(STRIP_SYMBOLS),true) @@ -1305,9 +1305,9 @@ ifeq ($(USE_WT),true) LIBFLAGS += -L$(WT_JANNET_DIR)/lib -lwt-jannet -lwt -lwtext -lwthttp -lwtfcgi endif -CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) -CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) -LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) +BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) +BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) +BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) #RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix)) RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk index 38e58daa..1ccb4f2f 100644 --- a/make/ldlibpath.mk +++ b/make/ldlibpath.mk @@ -5,7 +5,7 @@ LD_LIB_PATH_ENV := $(LD_LIBRARY_PATH) EXE_SEARCH_PATH_ENV := $(PATH) -LD_LIB_PATH_LDFLAGS = $(shell echo $(LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') +LD_LIB_PATH_LDFLAGS = $(shell echo $(BUILD_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') ifeq ($(TARGET),mingw) DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin diff --git a/make/lo.mk b/make/lo.mk index 9fc90baf..9a38d4b8 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -42,7 +42,7 @@ clean.lo: profclean clean.generated rm -f $(wildcard *.o *.so *.done *.dll $(OTHER_LIB)) $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(OTHER_LIB) - $(CPP) $< -L. $(OTHER_LIB_LDFLAGS) -shared $(LDFLAGS) -o $@ + $(CPP) $< -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ %.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%$(CPP_SUFFIX).h echo "#include \"$<\"" > $@.tmp diff --git a/make/plugin-version.mk b/make/plugin-version.mk index 53f0b290..c3cb8f9d 100644 --- a/make/plugin-version.mk +++ b/make/plugin-version.mk @@ -7,7 +7,7 @@ clean: clean.local distclean: version.o: version.cpp - $(CPP) $(CPPFLAGS) -o $@ -c $< + $(CPP) $(BUILD_CPPFLAGS) -o $@ -c $< clean.local: rm -f version.o diff --git a/make/qt-rules.mk b/make/qt-rules.mk index 0d305922..4da49625 100644 --- a/make/qt-rules.mk +++ b/make/qt-rules.mk @@ -3,7 +3,7 @@ moc_%.cpp: %.h $(MOC) -o $@ $< else moc_%.cpp: %.h - $(MOC) $(filter -D% -I%,$(strip $(CPPFLAGS))) -o $@ $< + $(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $< endif rcc_%.cpp: %.qrc diff --git a/make/rules.mk b/make/rules.mk index d465bcec..cd9f00eb 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -108,7 +108,7 @@ libpath: echo-ldflags: - @echo LDFLAGS = $(LDFLAGS) + @echo BUILD_LDFLAGS = $(BUILD_LDFLAGS) @echo LOCAL_LDFLAGS = $(LOCAL_LDFLAGS) @echo PROJECTLIB_LDFLAGS = $(PROJECTLIB_LDFLAGS) @echo PROJECT_LDFLAGS = $(PROJECT_LDFLAGS) @@ -119,10 +119,10 @@ echo-ldflags: echo-cflags: @echo LOCAL_CFLAGS = $(LOCAL_CFLAGS) @echo PROJECT_CFLAGS = $(PROJECT_CFLAGS) - @echo CFLAGS = $(CFLAGS) + @echo BUILD_CFLAGS = $(BUILD_CFLAGS) @echo LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS) @echo PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS) - @echo CPPFLAGS = $(CPPFLAGS) + @echo BUILD_CPPFLAGS = $(BUILD_CPPFLAGS) echo-development: echo DEVELOPMENT = $(DEVELOPMENT) @@ -189,17 +189,17 @@ strip.done: $(EXE_ALL) # make -$(MAKEFLAGS) -C $(shell dirname $@) `basename $@` .%.o.dep.mk: %.cpp $(BUILD_HDR) - $(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + $(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ .%.o.dep.mk: %.c $(BUILD_HDR) - $(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + $(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ ifeq ($(LIBTYPE),shared) $(SO_PREFIX)%.so: %.o - $(LD) -shared $(LDFLAGS) $^ -o $@ + $(LD) -shared $(BUILD_LDFLAGS) $^ -o $@ else $(SO_PREFIX)%.so: %.o - $(LD) $(LDFLAGS) $^ -o $@ + $(LD) $(BUILD_LDFLAGS) $^ -o $@ endif $(VERSION_SCRIPT): @@ -208,7 +208,7 @@ $(VERSION_SCRIPT): ifneq ($(TARGET),mingw) $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done $(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \ - $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ + $(filter-out -l$(LIBNAME),$(BUILD_LDFLAGS)) -o $@ else $(WINRES_RC): $(WINRES_RC_TMPL) $(CAT) $< | $(SED) " \ @@ -225,19 +225,19 @@ $(WINRES_O): $(WINRES_RC) $(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done $(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \ $(SED) 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \ - -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ + -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(BUILD_LDFLAGS)) -o $@ $(MSVCPP_IMPLIB): $(LIB_SO) $(MS_LD) /machine:i386 /def:$(LIB_DEF) endif %.o: %.cpp - $(CPP) $(CPPFLAGS) -c $< + $(CPP) $(BUILD_CPPFLAGS) -c $< %.o: %.c - $(CC) $(CFLAGS) -c $< + $(CC) $(BUILD_CFLAGS) -c $< %.o: %.S - $(CC) $(CFLAGS) -c $< + $(CC) $(BUILD_CFLAGS) -c $< timers_%.h: %.h $(GENERATE_FUNC_TIMERS) sh $(GENERATE_FUNC_TIMERS) $< $@ @@ -260,10 +260,10 @@ else endif $(EXE) $(EXE_BIN): - $(CPP) $(sort $(OBJ)) $(LDFLAGS) -o $@ + $(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ $(PLUGIN) $(PLUGIN_LIB): - $(CPP) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@ + $(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ # mkdir -p $(BUILD_LIBDIR) # install -m 755 $@ $(BUILD_LIBDIR)