diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index 12a4b61f..038d4625 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -31,7 +31,7 @@ TAGGED_TMPL_MAKEFILES = $(wildcard $(addsuffix .mk,$(foreach t,$(TAGGED_T ifneq ($(findstring st-nucleo-f103rb,$(TAGGED_TMPL_TAGS)),) TAGGED_TMPL_TAGS += cortex-m3 MCU_BOARD_MODEL ?= ST-NUCLEO-F103RB - BUILD_CPPFLAGS += -DST_NUCLEO_F103RB + FINAL_CPPFLAGS += -DST_NUCLEO_F103RB MCU_FLASH_OFFSET ?= 0x0000000 MCU_FLASH_SIZE ?= 0x5000 MCU_MEM_FETCH_OFFSET ?= 0x08000000 @@ -50,7 +50,7 @@ ifneq ($(findstring st-nucleo-f103rb,$(TAGGED_TMPL_TAGS)),) else ifneq ($(findstring st-disc1-f429i,$(TAGGED_TMPL_TAGS)),) TAGGED_TMPL_TAGS += cortex-m4 MCU_BOARD_MODEL ?= ST-DISC1-F429I - BUILD_CPPFLAGS += -DST_DISC1_F429I + FINAL_CPPFLAGS += -DST_DISC1_F429I #MCU_OPENOCD_CFG_NAME ?= openocd-st-stm32f429disc1.cfg MCU_OPENOCD_CFG_NAME ?= openocd-st-stm32f429discovery.cfg MCU_FLASH_BANK_NAME ?= internal @@ -83,7 +83,7 @@ else ifneq ($(findstring st-disc1-f429i,$(TAGGED_TMPL_TAGS)),) else ifneq ($(findstring st-disco-f769i,$(TAGGED_TMPL_TAGS)),) TAGGED_TMPL_TAGS += cortex-m7 MCU_BOARD_MODEL ?= ST-DISCO-F769I - BUILD_CPPFLAGS += -DST_DISCO_F769I + FINAL_CPPFLAGS += -DST_DISCO_F769I ifneq ($(findstring j-link,$(TAGGED_TMPL_TAGS)),) MCU_OPENOCD_CFG_NAME ?= openocd-stmqspi-st-stm32f769i-disco-jlink.cfg else @@ -154,20 +154,20 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- endif - BUILD_CPPFLAGS += -D_WINDOWS - BUILD_LDFLAGS += -lws2_32 + FINAL_CPPFLAGS += -D_WINDOWS + FINAL_LDFLAGS += -lws2_32 WINDRES ?= $(TC_BIN_PREFIX)windres USE_GFILTER ?= false MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE endif - #BUILD_CPPFLAGS += -I$(TC_SYS_ROOT)/include - #BUILD_LDFLAGS += -L$(TC_SYS_ROOT)/lib + #FINAL_CPPFLAGS += -I$(TC_SYS_ROOT)/include + #FINAL_LDFLAGS += -L$(TC_SYS_ROOT)/lib else # we're not cross-compiling TC_SYS_ROOT ?= /usr - BUILD_LIBFLAGS += -pthread + FINAL_LIBFLAGS += -pthread endif @@ -205,8 +205,8 @@ ifeq ($(COMPILER_SUITE),gcc) CXX ?= $(GXX) LD ?= $(GXX) - BUILD_CXXFLAGS += -std=c++$(CPP_STANDARD_VERSION) - BUILD_CFLAGS += -std=gnu$(C_STANDARD_VERSION) + FINAL_CXXFLAGS += -std=c++$(CPP_STANDARD_VERSION) + FINAL_CFLAGS += -std=gnu$(C_STANDARD_VERSION) ifeq ($(shell $(TEST) $(GCC_MAJOR) -ge 5; $(ECHO) $$?),0) ifeq ($(USE_CPP_FORCE_OVERRIDE),true) @@ -244,106 +244,106 @@ endif ifeq ($(COMPILER_SUITE),gcc) DEBUGGER ?= gdb - BUILD_EXTRA_DEBUG_FLAGS += -ggdb + FINAL_EXTRA_DEBUG_FLAGS += -ggdb else ifeq ($(COMPILER_SUITE),clang) DEBUGGER = lldb endif # -- gather compiler options in BUILD_XXXFLAGS -BUILD_CFLAGS += $(CFLAGS) -BUILD_CXXFLAGS += $(CXXFLAGS) -BUILD_CPPFLAGS += $(CPPFLAGS) -BUILD_LDFLAGS += $(LDFLAGS) +FINAL_CFLAGS += $(CFLAGS) +FINAL_CXXFLAGS += $(CXXFLAGS) +FINAL_CPPFLAGS += $(CPPFLAGS) +FINAL_LDFLAGS += $(LDFLAGS) -BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" -BUILD_LDFLAGS += -Wall +FINAL_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" +FINAL_LDFLAGS += -Wall ifeq ($(TARGET_ARCH),$(ARCH_32)) - BUILD_CPPFLAGS += -m32 - BUILD_LDFLAGS += -m32 + FINAL_CPPFLAGS += -m32 + FINAL_LDFLAGS += -m32 endif ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),) - BUILD_CPPFLAGS += -fPIC + FINAL_CPPFLAGS += -fPIC ifeq ($(findstring mingw,$(TARGET_ABI)),) ifeq ($(LIBTYPE),shared) - BUILD_LIBFLAGS += -ldl + FINAL_LIBFLAGS += -ldl else - BUILD_LIBFLAGS += -l:libdl.a + FINAL_LIBFLAGS += -l:libdl.a endif endif endif ifeq ($(TARGET_ARCH),armv7hl) - BUILD_CPPFLAGS += -fPIC + FINAL_CPPFLAGS += -fPIC else ifeq ($(TARGET_ARCH),aarch64) - BUILD_CPPFLAGS += -fPIC + FINAL_CPPFLAGS += -fPIC endif ifeq ($(DEVELOPMENT),true) - BUILD_CPPFLAGS += -D_DEVELOPMENT_ + FINAL_CPPFLAGS += -D_DEVELOPMENT_ export G_SLICE = always-malloc export G_DEBUG = gc-friendly,resident-modules export MALLOC_CHECK_ = 2 endif ifneq ($(LOG_QUAL_PREFIX),) - BUILD_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" + FINAL_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" endif ifeq ($(CATCH_ONLY_YERROR),true) - BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR + FINAL_CPPFLAGS += -DCATCH_ONLY_YERROR endif ifeq ($(USE_VERSION_MACROS),true) - BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" + FINAL_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" endif ifeq ($(TARGET_TRIPLET),arm-none-eabi) ifeq ($(TARGET_CPU),cortex-m3) - BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb - BUILD_LDFLAGS += -mcpu=cortex-m3 -mthumb + FINAL_CPPFLAGS += -mcpu=cortex-m3 -mthumb + FINAL_LDFLAGS += -mcpu=cortex-m3 -mthumb else ifeq ($(TARGET_CPU),cortex-m4) - BUILD_CPPFLAGS += -mcpu=cortex-m4 -mthumb - BUILD_LDFLAGS += -mcpu=cortex-m4 -mthumb + FINAL_CPPFLAGS += -mcpu=cortex-m4 -mthumb + FINAL_LDFLAGS += -mcpu=cortex-m4 -mthumb else ifeq ($(TARGET_CPU),cortex-m7) - BUILD_CPPFLAGS += -mcpu=cortex-m7 -mthumb - BUILD_LDFLAGS += -mcpu=cortex-m7 -mthumb + FINAL_CPPFLAGS += -mcpu=cortex-m7 -mthumb + FINAL_LDFLAGS += -mcpu=cortex-m7 -mthumb endif ifneq ($(findstring cortex-m,$(TARGET_CPU)),) # don't wrap error message lines - #BUILD_LDFLAGS += -fmessage-length=0 + #FINAL_LDFLAGS += -fmessage-length=0 # don't know what kind of optimization that is - #BUILD_LDFLAGS += -Og + #FINAL_LDFLAGS += -Og # stick with what janware code tends to expect - BUILD_LDFLAGS += -fsigned-char + FINAL_LDFLAGS += -fsigned-char # I have no clue which part would evaluate these names - BUILD_LDFLAGS += -ffunction-sections - BUILD_LDFLAGS += -fdata-sections - BUILD_LDFLAGS += -ffreestanding - BUILD_LDFLAGS += -fno-move-loop-invariants + FINAL_LDFLAGS += -ffunction-sections + FINAL_LDFLAGS += -fdata-sections + FINAL_LDFLAGS += -ffreestanding + FINAL_LDFLAGS += -fno-move-loop-invariants # skip any automatic initialization - BUILD_LDFLAGS += -nostartfiles + FINAL_LDFLAGS += -nostartfiles # garbage collect unused input sections - BUILD_LDFLAGS += -Xlinker --gc-sections - #BUILD_LDFLAGS += -Xlinker --print-gc-sections + FINAL_LDFLAGS += -Xlinker --gc-sections + #FINAL_LDFLAGS += -Xlinker --print-gc-sections # create map file - BUILD_LDFLAGS += -Wl,-Map,"$(EXE_MAP)" + FINAL_LDFLAGS += -Wl,-Map,"$(EXE_MAP)" # use newlib-nano, provides symbols _write _close _fstat _isatty _lseek (at least) # (TODO: No -Wl necessary?) - BUILD_LDFLAGS += --specs=nano.specs - BUILD_LDFLAGS += --specs=nosys.specs + FINAL_LDFLAGS += --specs=nano.specs + FINAL_LDFLAGS += --specs=nosys.specs endif @@ -353,70 +353,70 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi) ifeq ($(USE_DISABLE_COMPILER_OPTIMISATION_OPTS),true) ARM_NONE_EABI_ALLFLAGS += -Os endif - BUILD_LDFLAGS += $(ARM_NONE_EABI_ALLFLAGS) - BUILD_CPPFLAGS += $(ARM_NONE_EABI_ALLFLAGS) - BUILD_CXXFLAGS += -fno-rtti + FINAL_LDFLAGS += $(ARM_NONE_EABI_ALLFLAGS) + FINAL_CPPFLAGS += $(ARM_NONE_EABI_ALLFLAGS) + FINAL_CXXFLAGS += -fno-rtti # -- used by modm, but currently disabled for test purposes - #BUILD_CFLAGS += -fno-threadsafe-statics - #BUILD_CFLAGS += -fno-unwind-tables - #BUILD_CFLAGS += -fstrict-enums - #BUILD_CFLAGS += -fuse-cxa-atexit - #BUILD_CFLAGS += -fshort-wchar - #BUILD_CFLAGS += -fsingle-precision-constant - #BUILD_CFLAGS += -funsigned-bitfields - #BUILD_CFLAGS += -funsigned-char - #BUILD_CFLAGS += -fwrapv - #BUILD_CFLAGS += -g3 - #BUILD_CFLAGS += -gdwarf - #BUILD_CFLAGS += -W - #BUILD_CFLAGS += -Wall - #BUILD_CFLAGS += -Wdouble-promotion - #BUILD_CFLAGS += -Wduplicated-cond - #BUILD_CFLAGS += -Werror=format - #BUILD_CFLAGS += -Werror=maybe-uninitialized - #BUILD_CFLAGS += -Werror=overflow - #BUILD_CFLAGS += -Werror=sign-compare - #BUILD_CFLAGS += -Wextra - #BUILD_CFLAGS += -Wlogical-op - #BUILD_CFLAGS += -Wpointer-arith - #BUILD_CFLAGS += -Wundef + #FINAL_CFLAGS += -fno-threadsafe-statics + #FINAL_CFLAGS += -fno-unwind-tables + #FINAL_CFLAGS += -fstrict-enums + #FINAL_CFLAGS += -fuse-cxa-atexit + #FINAL_CFLAGS += -fshort-wchar + #FINAL_CFLAGS += -fsingle-precision-constant + #FINAL_CFLAGS += -funsigned-bitfields + #FINAL_CFLAGS += -funsigned-char + #FINAL_CFLAGS += -fwrapv + #FINAL_CFLAGS += -g3 + #FINAL_CFLAGS += -gdwarf + #FINAL_CFLAGS += -W + #FINAL_CFLAGS += -Wall + #FINAL_CFLAGS += -Wdouble-promotion + #FINAL_CFLAGS += -Wduplicated-cond + #FINAL_CFLAGS += -Werror=format + #FINAL_CFLAGS += -Werror=maybe-uninitialized + #FINAL_CFLAGS += -Werror=overflow + #FINAL_CFLAGS += -Werror=sign-compare + #FINAL_CFLAGS += -Wextra + #FINAL_CFLAGS += -Wlogical-op + #FINAL_CFLAGS += -Wpointer-arith + #FINAL_CFLAGS += -Wundef - #BUILD_CXXFLAGS += -fdata-sections - #BUILD_CXXFLAGS += -ffunction-sections - #BUILD_CXXFLAGS += -finline-limit=10000 - #BUILD_CPPFLAGS += -fshort-wchar - #BUILD_CPPFLAGS += -fsingle-precision-constant - #BUILD_CPPFLAGS += -funsigned-bitfields - #BUILD_CPPFLAGS += -funsigned-char - #BUILD_CPPFLAGS += -fwrapv - #BUILD_CPPFLAGS += -g3 - #BUILD_CPPFLAGS += -gdwarf - #BUILD_CPPFLAGS += -W - #BUILD_CPPFLAGS += -Wall - #BUILD_CPPFLAGS += -Wdouble-promotion - #BUILD_CPPFLAGS += -Wduplicated-cond - #BUILD_CPPFLAGS += -Werror=format - #BUILD_CPPFLAGS += -Werror=maybe-uninitialized - #BUILD_CPPFLAGS += -Werror=overflow - #BUILD_CPPFLAGS += -Werror=sign-compare - #BUILD_CPPFLAGS += -Wextra - #BUILD_CPPFLAGS += -Wlogical-op - #BUILD_CXXFLAGS += -Wpointer-arith - #BUILD_CPPFLAGS += -Wundef - #BUILD_CXXFLAGS += -fno-threadsafe-statics - #BUILD_CPPFLAGS += -fno-unwind-tables - #BUILD_CXXFLAGS += -fstrict-enums - #BUILD_CPPFLAGS += -fuse-cxa-atexit - #BUILD_CXXFLAGS += -std=c++17 - #BUILD_CXXFLAGS += -Woverloaded-virtual - #BUILD_CXXFLAGS += -fno-move-loop-invariants - #BUILD_CPPFLAGS += -fno-split-wide-types - #BUILD_CPPFLAGS += -fno-tree-loop-optimize + #FINAL_CXXFLAGS += -fdata-sections + #FINAL_CXXFLAGS += -ffunction-sections + #FINAL_CXXFLAGS += -finline-limit=10000 + #FINAL_CPPFLAGS += -fshort-wchar + #FINAL_CPPFLAGS += -fsingle-precision-constant + #FINAL_CPPFLAGS += -funsigned-bitfields + #FINAL_CPPFLAGS += -funsigned-char + #FINAL_CPPFLAGS += -fwrapv + #FINAL_CPPFLAGS += -g3 + #FINAL_CPPFLAGS += -gdwarf + #FINAL_CPPFLAGS += -W + #FINAL_CPPFLAGS += -Wall + #FINAL_CPPFLAGS += -Wdouble-promotion + #FINAL_CPPFLAGS += -Wduplicated-cond + #FINAL_CPPFLAGS += -Werror=format + #FINAL_CPPFLAGS += -Werror=maybe-uninitialized + #FINAL_CPPFLAGS += -Werror=overflow + #FINAL_CPPFLAGS += -Werror=sign-compare + #FINAL_CPPFLAGS += -Wextra + #FINAL_CPPFLAGS += -Wlogical-op + #FINAL_CXXFLAGS += -Wpointer-arith + #FINAL_CPPFLAGS += -Wundef + #FINAL_CXXFLAGS += -fno-threadsafe-statics + #FINAL_CPPFLAGS += -fno-unwind-tables + #FINAL_CXXFLAGS += -fstrict-enums + #FINAL_CPPFLAGS += -fuse-cxa-atexit + #FINAL_CXXFLAGS += -std=c++17 + #FINAL_CXXFLAGS += -Woverloaded-virtual + #FINAL_CXXFLAGS += -fno-move-loop-invariants + #FINAL_CPPFLAGS += -fno-split-wide-types + #FINAL_CPPFLAGS += -fno-tree-loop-optimize - #BUILD_CPPFLAGS += -fno-exceptions - #BUILD_CXXFLAGS += -fno-rtti + #FINAL_CPPFLAGS += -fno-exceptions + #FINAL_CXXFLAGS += -fno-rtti ifneq ($(findstring gnu-mcu-eclipse,$(TAGGED_TMPL_TAGS)),) LD_DEFINE_SYMBOLS += _sbrk @@ -424,7 +424,7 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi) endif -BUILD_LDFLAGS += $(addprefix -u ,$(LD_DEFINE_SYMBOLS)) +FINAL_LDFLAGS += $(addprefix -u ,$(LD_DEFINE_SYMBOLS)) # -- target files and dirs @@ -463,7 +463,7 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*)) ifeq ($(GCC_MAJOR),4) - BUILD_CPPFLAGS += -DGCC_HASCLASSVISIBILITY + FINAL_CPPFLAGS += -DGCC_HASCLASSVISIBILITY endif ifeq ($(USE_QT),true) @@ -472,33 +472,33 @@ ifeq ($(USE_QT),true) endif ifeq ($(USE_X),true) - BUILD_LDFLAGS += -L/usr/X11/$(SYSTEM_LIBDIR_NAME) -lXext -lX11 + FINAL_LDFLAGS += -L/usr/X11/$(SYSTEM_LIBDIR_NAME) -lXext -lX11 endif ifneq ($(TARGET_TRIPLET),arm-none-eabi) - BUILD_LPPFLAGS += -lstdc++ + FINAL_LPPFLAGS += -lstdc++ endif ifeq ($(GCC_MAJOR),2) - BUILD_LPPFLAGS += -lm - BUILD_CPPFLAGS += -I/usr/local/include + FINAL_LPPFLAGS += -lm + FINAL_CPPFLAGS += -I/usr/local/include else ifeq ($(GCC_MAJOR),3) ifeq ($(GCC_MINOR),3) - BUILD_LPPFLAGS += -lgcc_s - # BUILD_LPPFLAGS += -L/usr/local/gcc3.3/lib + FINAL_LPPFLAGS += -lgcc_s + # FINAL_LPPFLAGS += -L/usr/local/gcc3.3/lib endif endif endif ifeq ($(TARGET),mingw) - BUILD_CPPFLAGS += -DWIN32 + FINAL_CPPFLAGS += -DWIN32 # see https://stackoverflow.com/questions/4492799 - BUILD_LDFLAGS += -fstack-protector + FINAL_LDFLAGS += -fstack-protector endif ifeq ($(LOG_THREAD_NAMES), true) - BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES + FINAL_CPPFLAGS += -DSLOG_THREAD_NAMES endif # ----- standard features, switched on with USE_XXX = true @@ -518,21 +518,21 @@ endif ifneq ($(filter jw-build,$(PREREQ_BUILD)),) ifeq ($(TARGET),mingw) - JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ + JW_FINAL_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ endif endif ifeq ($(USE_SYSTEMD),true) - BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd) - BUILD_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd) + FINAL_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd) + FINAL_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd) endif ifeq ($(USE_TIMER),true) - BUILD_CPPFLAGS += -D_USE_TIMER_ + FINAL_CPPFLAGS += -D_USE_TIMER_ endif ifeq ($(USE_FAST_LOG),false) - BUILD_CPPFLAGS += -D_USE_FAST_LOG_=0 + FINAL_CPPFLAGS += -D_USE_FAST_LOG_=0 endif ifeq ($(USE_YAMD),true) @@ -540,87 +540,87 @@ ifeq ($(USE_YAMD),true) endif ifeq ($(USE_MPATROL),true) - #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h - BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty + #FINAL_CPPFLAGS += -include /usr/include/mpatrol.h + FINAL_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(USE_VALGRIND),true) - BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ - # BUILD_LDFLAGS += + FINAL_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ + # FINAL_LDFLAGS += endif ifeq ($(USE_MCHECK),true) - BUILD_LDFLAGS += -lmcheck + FINAL_LDFLAGS += -lmcheck endif ifeq ($(USE_STACK_PROTECTOR),true) - BUILD_CPPFLAGS += -fstack-protector-all - #BUILD_CPPFLAGS += -fstack-protector + FINAL_CPPFLAGS += -fstack-protector-all + #FINAL_CPPFLAGS += -fstack-protector endif ifeq ($(USE_STACK_CHECKER),true) ifeq "$(COMPILER_SUITE)" "clang" - BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer - BUILD_LDFLAGS += -fsanitize=address + FINAL_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer + FINAL_LDFLAGS += -fsanitize=address endif endif ifeq ($(USE_DBMALLOC),true) CONTRIB_LIBS += dbmalloc - BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc - BUILD_LDFLAGS += -ldbmalloc + FINAL_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc + FINAL_LDFLAGS += -ldbmalloc endif ifeq ($(USE_DMALLOC),true) - BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT - BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth + FINAL_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT + FINAL_LDFLAGS += -ldmallocthcxx -ldmallocth endif ifeq ($(USE_MEMWATCH),true) - BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO + FINAL_CPPFLAGS += -DMEMWATCH -DMW_STDIO endif ifeq ($(USE_EFENCE),true) - BUILD_CPPFLAGS += -DEFENCE - BUILD_LDFLAGS += -lefence + FINAL_CPPFLAGS += -DEFENCE + FINAL_LDFLAGS += -lefence endif ifeq ($(USE_TRACING),true) - BUILD_CPPFLAGS += -D_DO_TRACE_ + FINAL_CPPFLAGS += -D_DO_TRACE_ endif ifeq ($(USE_ASSERTIONS),false) - BUILD_CPPFLAGS += -DNDEBUG + FINAL_CPPFLAGS += -DNDEBUG endif ifeq ($(COMPILE_DEBUG_CODE),true) - BUILD_CPPFLAGS += -D_DEBUG_ + FINAL_CPPFLAGS += -D_DEBUG_ endif ifeq ($(COMPILE_DEBUG_LOG),true) - BUILD_CPPFLAGS += -D_LOG_DEBUG_ + FINAL_CPPFLAGS += -D_LOG_DEBUG_ endif ifeq ($(USE_MPATROL),true) - BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h - BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty + FINAL_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h + FINAL_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(BREAK_ABI),true) - BUILD_CPPFLAGS += -D_BREAK_ABI_ + FINAL_CPPFLAGS += -D_BREAK_ABI_ endif ifeq ($(USE_STACK_CHECK),true) - BUILD_CPPFLAGS += -fstack-check + FINAL_CPPFLAGS += -fstack-check endif ifeq ($(USE_COMPILER_DEBUG_OPTS),true) - #BUILD_EXTRA_DEBUG_FLAGS += -gdwarf-2 - BUILD_CPPFLAGS += -g3 $(BUILD_EXTRA_DEBUG_FLAGS) - BUILD_LDFLAGS += -g3 $(BUILD_EXTRA_DEBUG_FLAGS) + #FINAL_EXTRA_DEBUG_FLAGS += -gdwarf-2 + FINAL_CPPFLAGS += -g3 $(FINAL_EXTRA_DEBUG_FLAGS) + FINAL_LDFLAGS += -g3 $(FINAL_EXTRA_DEBUG_FLAGS) ifneq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) - BUILD_CPPFLAGS += -Og - BUILD_LDFLAGS += -Og + FINAL_CPPFLAGS += -Og + FINAL_LDFLAGS += -Og endif endif @@ -631,11 +631,11 @@ ifeq ($(CC),$(GCC)) -fno-early-inlining \ -fno-default-inline else ifeq ($(CC),$(CLANG)) - BUILD_CPPFLAGS += -Werror + FINAL_CPPFLAGS += -Werror endif ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) - BUILD_CPPFLAGS += -funroll-loops -O3 + FINAL_CPPFLAGS += -funroll-loops -O3 else ifeq ($(USE_DISABLE_COMPILER_OPTIMISATION_OPTS),true) NO_OPT_FLAGS = \ -O0 -g -fno-inline -fno-omit-frame-pointer \ @@ -657,12 +657,12 @@ else ifeq ($(USE_DISABLE_COMPILER_OPTIMISATION_OPTS),true) -fno-inline-functions \ $(GCC_NO_OPT_FLAGS) - BUILD_CPPFLAGS += $(NO_OPT_FLAGS) - BUILD_LDFLAGS += $(NO_OPT_FLAGS) + FINAL_CPPFLAGS += $(NO_OPT_FLAGS) + FINAL_LDFLAGS += $(NO_OPT_FLAGS) endif ifeq ($(USE_EXCEPTIONS_IN_C),true) - BUILD_CFLAGS += -fexceptions + FINAL_CFLAGS += -fexceptions ifeq ($(LIBTYPE),shared) GCC_LDFLAGS += -shared-libgcc endif @@ -672,42 +672,42 @@ ifeq ($(STRIP_SYMBOLS),true) STRIP_DONE ?= strip.done endif -BUILD_INCLUDE += $(LOCAL_INCLUDE) +FINAL_INCLUDE += $(LOCAL_INCLUDE) # force use of double quotes, allow header namespaces ifeq ($(HDRDIR_SCOPE_SUFFIX),) - BUILD_INCLUDE += -I. + FINAL_INCLUDE += -I. else - BUILD_INCLUDE += -iquote . + FINAL_INCLUDE += -iquote . endif ifeq ($(USE_PROJECT_LIB),true) - BUILD_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include - BUILD_LIBFLAGS += -L$(BUILD_LIBDIR) + FINAL_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include + FINAL_LIBFLAGS += -L$(BUILD_LIBDIR) endif -BUILD_INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) +FINAL_INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE)) -BUILD_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD)) +FINAL_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD)) # the following is necessary, because not all projects have build.libname = none in project.conf ifeq ($(USE_PROJECT_LIB),true) LDFLAGS_QUERY_ARGS_SELF = --add-self endif -BUILD_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT)) +FINAL_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT)) ifeq ($(USE_SNDFILE),true) - BUILD_LIBFLAGS += -lsndfile + FINAL_LIBFLAGS += -lsndfile endif ifeq ($(USE_FFTW),true) - BUILD_LIBFLAGS += -lfftw3 + FINAL_LIBFLAGS += -lfftw3 endif ifeq ($(USE_GLIB),true) - BUILD_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) - BUILD_LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0) + FINAL_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) + FINAL_LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0) endif ifeq ($(CC),$(CLANG)) @@ -724,18 +724,18 @@ ifeq ($(CC),$(GCC)) COMPILER_LDFLAGS += $(GCC_LDFLAGS) endif -BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(BUILD_INCLUDE) -BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_INCLUDE) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(BUILD_INCLUDE) -BUILD_CXXFLAGS += $(LOCAL_CXXFLAGS) $(PROJECT_CXXFLAGS) $(COMPILER_CXXFLAGS) $(BUILD_INCLUDE) -BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(BUILD_LPPFLAGS) $(BUILD_LIBFLAGS) +FINAL_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(FINAL_INCLUDE) +FINAL_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_INCLUDE) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(FINAL_INCLUDE) +FINAL_CXXFLAGS += $(LOCAL_CXXFLAGS) $(PROJECT_CXXFLAGS) $(COMPILER_CXXFLAGS) $(FINAL_INCLUDE) +FINAL_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(FINAL_LPPFLAGS) $(FINAL_LIBFLAGS) #RPM_REQUIRES = $(shell $(ECHO) "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix)) RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) -REAL_CFLAGS ?= $(BUILD_CFLAGS) -REAL_CPPFLAGS ?= $(BUILD_CPPFLAGS) -REAL_CXXFLAGS ?= $(BUILD_CXXFLAGS) -REAL_LDFLAGS ?= $(BUILD_LDFLAGS) +REAL_CFLAGS ?= $(FINAL_CFLAGS) +REAL_CPPFLAGS ?= $(FINAL_CPPFLAGS) +REAL_CXXFLAGS ?= $(FINAL_CXXFLAGS) +REAL_LDFLAGS ?= $(FINAL_LDFLAGS) # -- LIB INSTALLATION_FILE_TYPES += LIB @@ -759,11 +759,11 @@ INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib ifeq ($(LIBTYPE),shared) ifneq ($(TARGET),mingw) - BUILD_LDFLAGS += -rdynamic + FINAL_LDFLAGS += -rdynamic endif else LIB_SO ?= - BUILD_LDFLAGS += -static + FINAL_LDFLAGS += -static endif ifeq ($(USE_PROJECT_LIB),true) diff --git a/make/depend.mk b/make/depend.mk index 7850f5f2..510641a4 100644 --- a/make/depend.mk +++ b/make/depend.mk @@ -27,13 +27,13 @@ endif %.o: .%.o.dep.mk .%.o.dep.mk: %.cpp $(BUILD_HDR) - $(CC) -M $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ + $(CC) -M $(FINAL_CXXFLAGS) $(FINAL_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ .%.o.dep.mk: %.cc $(BUILD_HDR) - $(CC) -M $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ + $(CC) -M $(FINAL_CXXFLAGS) $(FINAL_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ .%.o.dep.mk: %.c $(BUILD_HDR) - $(CC) -M $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ + $(CC) -M $(FINAL_CFLAGS) $(FINAL_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ show-vars: show-vars-depend-mk show-vars-depend-mk: diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk index d640e0d6..2c12aab7 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 $(BUILD_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') +LD_LIB_PATH_LDFLAGS = $(shell echo $(FINAL_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 0ce5b371..4ee14419 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -47,7 +47,7 @@ clean.lo: profclean clean.generated $(RM) -f $(wildcard *.o *.so *.done *.dll $(OTHER_LIB)) $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(CPP_PREFIX)%.o $(OTHER_LIB) - $(CXX) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ + $(CXX) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(FINAL_LDFLAGS) -o $@ %.cpp: $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)%$(CPP_SUFFIX).h echo "#include \"$<\"" > $@.tmp diff --git a/make/main.mk b/make/main.mk index 7dcb1f2e..8a230a2d 100644 --- a/make/main.mk +++ b/make/main.mk @@ -1,7 +1,7 @@ EXE = $(PROJECT) ifneq ($(TARGET),mingw) -BUILD_LDFLAGS += -rdynamic +FINAL_LDFLAGS += -rdynamic endif include $(MODDIR)/make/exe.mk diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk index 83e962f8..da2e9907 100644 --- a/make/plugin-defs.mk +++ b/make/plugin-defs.mk @@ -17,11 +17,11 @@ endif PLUGIN_PREFIX_AND_API ?= $(PLUGIN_PREFIX_)$(PLUGIN_API) PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) -BUILD_CPPFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" +FINAL_CPPFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" ifeq ($(USE_PLUGIN_VERSION_LIB),true) PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX_AND_API)_version PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a #INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a -BUILD_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive +FINAL_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive endif diff --git a/make/plugin-version.mk b/make/plugin-version.mk index 5e3a22ef..b8106a62 100644 --- a/make/plugin-version.mk +++ b/make/plugin-version.mk @@ -8,7 +8,7 @@ clean: clean.local distclean: version.o: version.cpp - $(CXX) $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS) -o $@ -c $< + $(CXX) $(FINAL_CXXFLAGS) $(FINAL_CPPFLAGS) -o $@ -c $< clean.local: $(RM) -f version.o diff --git a/make/plugin.mk b/make/plugin.mk index eda3ed78..8332309f 100644 --- a/make/plugin.mk +++ b/make/plugin.mk @@ -13,8 +13,8 @@ include $(MODDIR)/make/depend.mk include $(MODDIR)/make/backup.mk include $(MODDIR)/make/dev-utils.mk -BUILD_CXXFLAGS += -D_PLUGIN -BUILD_CFLAGS += -D_PLUGIN +FINAL_CXXFLAGS += -D_PLUGIN +FINAL_CFLAGS += -D_PLUGIN all: build_LIB install: install_LIB diff --git a/make/profiler-defs.mk b/make/profiler-defs.mk index a7967629..dcd5013b 100644 --- a/make/profiler-defs.mk +++ b/make/profiler-defs.mk @@ -6,25 +6,25 @@ CALLGRIND_OUT ?= callgrind.out OPROF_OUT_DIR ?= oprofile-data ifeq ($(USE_GPROF),true) - BUILD_CXXFLAGS += -pg - BUILD_CFLAGS += -pg - BUILD_LDFLAGS += -pg + FINAL_CXXFLAGS += -pg + FINAL_CFLAGS += -pg + FINAL_LDFLAGS += -pg clean: clean.gprof endif ifeq ($(COMPILER_SUITE),gcc) ifeq ($(USE_GCOV),true) - BUILD_CXXFLAGS += -fprofile-arcs -ftest-coverage - BUILD_CFLAGS += -fprofile-arcs -ftest-coverage - BUILD_LDFLAGS += -fprofile-arcs -ftest-coverage + FINAL_CXXFLAGS += -fprofile-arcs -ftest-coverage + FINAL_CFLAGS += -fprofile-arcs -ftest-coverage + FINAL_LDFLAGS += -fprofile-arcs -ftest-coverage clean: clean.gcov endif endif ifeq ($(COMPILER_SUITE),clang) ifeq ($(USE_XRAY),true) - BUILD_CXXFLAGS += -fxray-instrument -fxray-instruction-threshold=1 - BUILD_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 - #BUILD_LDFLAGS += -fxray-instrument + FINAL_CXXFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + FINAL_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + #FINAL_LDFLAGS += -fxray-instrument endif endif diff --git a/make/qt-defs.mk b/make/qt-defs.mk index 116a01a9..65253000 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -1,7 +1,7 @@ ifeq ($(USE_QT),true) USE_X = true -BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT +FINAL_CPPFLAGS += -DQT_THREAD_SUPPORT #ifeq ($(PKG_FORMAT),rpm) #QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt) @@ -48,17 +48,17 @@ BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT # #ifdef REENTRANT # ifneq ($(QT_MAJOR_VERSION),4) -# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt-mt +# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lqt-mt # else -# # BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug -# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore +# # FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug +# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore # endif #else # ifneq ($(QT_MAJOR_VERSION),4) -# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt +# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lqt # else -# # BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug -# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore +# # FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug +# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore # endif #endif @@ -124,8 +124,8 @@ QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODU MOC ?= $(QT_BIN_PREFIX)/moc UIC ?= $(QT_BIN_PREFIX)/uic RCC ?= $(QT_BIN_PREFIX)/rcc -BUILD_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) -BUILD_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) +FINAL_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) +FINAL_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) # ------------------------------- jw-build defs @@ -145,8 +145,8 @@ ifeq ($(QT_MAJOR_VERSION),4) UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES)) else UIC_H += $(patsubst %.ui,%.h, $(UIFILES)) -BUILD_CFLAGS += -fPIC -BUILD_CXXFLAGS += -fPIC +FINAL_CFLAGS += -fPIC +FINAL_CXXFLAGS += -fPIC endif UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES)) diff --git a/make/qt-rules.mk b/make/qt-rules.mk index 9f9d1575..b761adbe 100644 --- a/make/qt-rules.mk +++ b/make/qt-rules.mk @@ -3,9 +3,9 @@ moc_%.cpp: %.h $(MOC) -o $@ $< else moc_%.cpp: %.h - $(MOC) $(filter -D% -I%,$(strip $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS))) -o $@ $< + $(MOC) $(filter -D% -I%,$(strip $(FINAL_CXXFLAGS) $(FINAL_CPPFLAGS))) -o $@ $< moc_%.cpp: include/%.h - $(MOC) $(filter -D% -I%,$(strip $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS))) -o $@ $< + $(MOC) $(filter -D% -I%,$(strip $(FINAL_CXXFLAGS) $(FINAL_CPPFLAGS))) -o $@ $< endif rcc_%.cpp: %.qrc diff --git a/make/rules.mk b/make/rules.mk index 3855be76..1f8484ad 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -163,25 +163,25 @@ echo-compilers: @echo "GNU_LD_REV = $(GNU_LD_REV)" echo-ldflags: - @echo "BUILD_LDFLAGS = $(BUILD_LDFLAGS)" + @echo "FINAL_LDFLAGS = $(FINAL_LDFLAGS)" @echo "LOCAL_LDFLAGS = $(LOCAL_LDFLAGS)" @echo "PROJECTLIB_LDFLAGS = $(PROJECTLIB_LDFLAGS)" @echo "PROJECT_LDFLAGS = $(PROJECT_LDFLAGS)" - @echo "BUILD_LPPFLAGS = $(BUILD_LPPFLAGS)" - @echo "BUILD_LIBFLAGS = $(BUILD_LIBFLAGS)" + @echo "FINAL_LPPFLAGS = $(FINAL_LPPFLAGS)" + @echo "FINAL_LIBFLAGS = $(FINAL_LIBFLAGS)" @echo "QT_LDFLAGS = $(QT_LDFLAGS)" @echo "REAL_LDFLAGS = $(REAL_LDFLAGS)" echo-cflags: @echo "LOCAL_CFLAGS = $(LOCAL_CFLAGS)" @echo "PROJECT_CFLAGS = $(PROJECT_CFLAGS)" - @echo "BUILD_CFLAGS = $(BUILD_CFLAGS)" + @echo "FINAL_CFLAGS = $(FINAL_CFLAGS)" @echo "LOCAL_CXXFLAGS = $(LOCAL_CXXFLAGS)" @echo "PROJECT_CXXFLAGS = $(PROJECT_CXXFLAGS)" - @echo "BUILD_CXXFLAGS = $(BUILD_CXXFLAGS)" + @echo "FINAL_CXXFLAGS = $(FINAL_CXXFLAGS)" @echo "LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS)" @echo "PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS)" - @echo "BUILD_CPPFLAGS = $(BUILD_CPPFLAGS)" + @echo "FINAL_CPPFLAGS = $(FINAL_CPPFLAGS)" @echo "REAL_CFLAGS = $(REAL_CFLAGS)" @echo "REAL_CXXFLAGS = $(REAL_CXXFLAGS)" @@ -217,7 +217,7 @@ echo-modules: @echo "SCOPE_CASMIX = $(SCOPE_CASMIX_DIR)" echo-include: - @echo "INCLUDE : $(BUILD_INCLUDE)" + @echo "INCLUDE : $(FINAL_INCLUDE)" echo-mk: @echo MAKEFILE_LIST = $(MAKEFILE_LIST) diff --git a/make/run.mk b/make/run.mk index 48e49431..3ce64c74 100644 --- a/make/run.mk +++ b/make/run.mk @@ -33,8 +33,8 @@ endif EXE_PATH ?= ./$(EXE) CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf) -BUILD_CFLAGS += -DEXE_NAME=\"$(EXE)\" -BUILD_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" +FINAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" +FINAL_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" # ----- linker scripts from tagged templates #BUILD_LD_DIR = $(wildcard $(firstword $(call $(TAGGED_TMPL_DIRS),ld))) @@ -43,11 +43,11 @@ BUILD_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" #BUILD_LD_TMPL_DIRS ?= $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(repo)/$(tag)/ld)) #BUILD_LD_DIRS += $(wildcard $(BUILD_LD_TMPL_DIRS)) -#BUILD_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) +#FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) BUILD_LD_DIRS = $(call uniq,$(dir $(foreach d,$(BUILD_LD_CHECK_DIRS),$(wildcard $(d)/*.ld)))) LD_SCRIPTS = $(foreach d,$(BUILD_LD_DIRS),$(wildcard $(d)/*.ld)) -BUILD_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) +FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) include $(MODDIR)/make/profiler.mk BUILD_HDR = diff --git a/make/swig.mk b/make/swig.mk index 02d35348..dfd74601 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -29,10 +29,10 @@ ifeq ($(SWIG_TARGET),php) endif SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI) - BUILD_INCLUDE += $(shell php-config --includes) + FINAL_INCLUDE += $(shell php-config --includes) INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions - BUILD_CFLAGS += -Wno-unused-label -Wno-unused-function - BUILD_CXXFLAGS += -Wno-unused-label -Wno-unused-function + FINAL_CFLAGS += -Wno-unused-label -Wno-unused-function + FINAL_CXXFLAGS += -Wno-unused-label -Wno-unused-function all: @@ -75,8 +75,8 @@ else ifeq ($(SWIG_TARGET),python) SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) - BUILD_INCLUDE += $(shell pkg-config --cflags python$(PYTHON_VERSION)) - BUILD_LDFLAGS += $(shell pkg-config --libs python$(PYTHON_VERSION)) + FINAL_INCLUDE += $(shell pkg-config --cflags python$(PYTHON_VERSION)) + FINAL_LDFLAGS += $(shell pkg-config --libs python$(PYTHON_VERSION)) INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) @@ -114,8 +114,8 @@ else ifeq ($(SWIG_TARGET),java) #SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) #SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) - BUILD_INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux - #BUILD_LDFLAGS += + FINAL_INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux + #FINAL_LDFLAGS += INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) @@ -130,7 +130,7 @@ else ifeq ($(SWIG_TARGET),perl) PERL_BASE_DIR ?= $(firstword $(wildcard $(addprefix $(BUILD_LIBS_PREFIX),/usr/lib64/perl5 /usr/lib/perl /usr/lib/perl5 /usr/lib/perl-native/perl))) PERL_CORE_DIR ?= $(firstword $(wildcard $(addprefix $(PERL_BASE_DIR)/,$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE $(PERL_VERSION)/CORE CORE))) PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi - BUILD_INCLUDE += -I$(PERL_CORE_DIR) + FINAL_INCLUDE += -I$(PERL_CORE_DIR) SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT)) INSTALL_LIBDIR = $(ENV_PREFIX)$(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE) SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)$(PERL_VENDOR_DIR) @@ -141,7 +141,7 @@ else endif -SWIG_INCLUDE ?= $(filter-out -iquote .,$(BUILD_INCLUDE)) +SWIG_INCLUDE ?= $(filter-out -iquote .,$(FINAL_INCLUDE)) SWIG_USE_CPP ?= true ifeq ($(SWIG_USE_CPP),true) @@ -170,8 +170,8 @@ SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MOD SWIG_DEFINES += -DNON_C_BINDING SWIG_OPTS += $(SWIG_DEFINES) -BUILD_CFLAGS += $(SWIG_DEFINES) -BUILD_CXXFLAGS += $(SWIG_DEFINES) +FINAL_CFLAGS += $(SWIG_DEFINES) +FINAL_CXXFLAGS += $(SWIG_DEFINES) # for depend.mk BUILD_OBJ = $(SWIG_OBJ) @@ -191,7 +191,7 @@ $(SWIG_MODULE_WRAP_C): $(SWIG_INTERFACE_I) $(SWIG_POSTPROCESS) $(SWIG_MODULE_SO): $(SWIG_OBJ) - $(CXX) $^ -shared $(BUILD_LDFLAGS) -o $@ + $(CXX) $^ -shared $(FINAL_LDFLAGS) -o $@ $(SWIG_MODULE_TARGET_DIR): mkdir -p $@ diff --git a/make/targets-tools.mk b/make/targets-tools.mk index e2ae5d40..ed507b16 100644 --- a/make/targets-tools.mk +++ b/make/targets-tools.mk @@ -78,25 +78,25 @@ clang-tidy-clean: rm -f clang-tidy-cache*.tmp CLANG_TIDY_CACHE_CPP = clang-tidy-cache-cpp.tmp $(CLANG_TIDY_CACHE_CPP): $(LOCAL_CPP) - $(CLANG_TIDY) $(LOCAL_CPP) -- $(BUILD_INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@ + $(CLANG_TIDY) $(LOCAL_CPP) -- $(FINAL_INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@ clang-tidy-h-c-cpp: ifneq ($(CLANG_TIDY_H_C_CPP),) - $(CLANG_TIDY) $(CLANG_TIDY_H_C_CPP) -- $(BUILD_INCLUDE) + $(CLANG_TIDY) $(CLANG_TIDY_H_C_CPP) -- $(FINAL_INCLUDE) endif clang-tidy-h-c: ifneq ($(CLANG_TIDY_H_C_C),) - $(CLANG_TIDY) $(CLANG_TIDY_H_C) -- $(BUILD_INCLUDE) + $(CLANG_TIDY) $(CLANG_TIDY_H_C) -- $(FINAL_INCLUDE) endif clang-tidy-h-cpp: ifneq ($(CLANG_TIDY_H_CPP),) - $(CLANG_TIDY) $(CLANG_TIDY_H_CPP) -- $(BUILD_INCLUDE) -x c++ + $(CLANG_TIDY) $(CLANG_TIDY_H_CPP) -- $(FINAL_INCLUDE) -x c++ endif clang-tidy-h: clang-tidy-h-c clang-tidy-h-cpp clang-tidy-h-c-cpp clang-tidy-c: ifneq ($(LOCAL_C),) - $(CLANG_TIDY) $(LOCAL_C) -- $(BUILD_INCLUDE) + $(CLANG_TIDY) $(LOCAL_C) -- $(FINAL_INCLUDE) endif clang-tidy-cpp: $(CLANG_TIDY_CACHE_CPP) cat $< diff --git a/make/tools.mk b/make/tools.mk index f667c53b..23df11b2 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -12,8 +12,8 @@ include $(MODDIR)/make/depend.mk include $(MODDIR)/make/backup.mk include $(MODDIR)/make/dev-utils.mk -BUILD_CFLAGS += -D_USRDLL -DALL_EXPORTS -BUILD_CXXFLAGS += -D_USRDLL -DALL_EXPORTS +FINAL_CFLAGS += -D_USRDLL -DALL_EXPORTS +FINAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS ifneq ($(SRC_ALL_CPP),) all: all.done diff --git a/make/wt-defs.mk b/make/wt-defs.mk index d63e1887..a2ad1e47 100644 --- a/make/wt-defs.mk +++ b/make/wt-defs.mk @@ -3,19 +3,19 @@ ifeq ($(USE_WT),true) # WT_VERSION = $(shell $(RPM) -q wt-devel | sed 's/wt-devel-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/;') ifeq ($(USE_WT_FASTCGI),true) - BUILD_LDFLAGS += -lwtfcgi + FINAL_LDFLAGS += -lwtfcgi endif ifeq ($(USE_WT_HTTPD),true) - BUILD_LDFLAGS += -lwthttp - BUILD_CFLAGS += -DCONNECTOR_HTTP=YES - BUILD_CXXFLAGS += -DCONNECTOR_HTTP=YES + FINAL_LDFLAGS += -lwthttp + FINAL_CFLAGS += -DCONNECTOR_HTTP=YES + FINAL_CXXFLAGS += -DCONNECTOR_HTTP=YES endif ifeq ($(USE_WT_DBO),true) - BUILD_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo + FINAL_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo endif - BUILD_LDFLAGS += -lwt + FINAL_LDFLAGS += -lwt endif diff --git a/make/yapp.mk b/make/yapp.mk index 975bfff8..a2cba39c 100644 --- a/make/yapp.mk +++ b/make/yapp.mk @@ -3,11 +3,11 @@ YAPP_INCLUDE_DIR ?= . YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \ $(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h))))) YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\ - $(YAPP_INCLUDE_DIR) $(subst -I,,$(BUILD_INCLUDE)))) $(YAPP_CLASS).h) + $(YAPP_INCLUDE_DIR) $(subst -I,,$(FINAL_INCLUDE)))) $(YAPP_CLASS).h) YAPP_NAMESPACE ?= ifneq ($(TARGET),mingw) -BUILD_LDFLAGS += -rdynamic +FINAL_LDFLAGS += -rdynamic endif include $(MODDIR)/make/exe.mk