diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index c1fce68c..7b49176c 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -142,15 +142,15 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- endif - PROJECT_CPPFLAGS += -D_WINDOWS + BUILD_CPPFLAGS += -D_WINDOWS BUILD_LDFLAGS += -lws2_32 WINDRES ?= $(TC_BIN_PREFIX)windres USE_GFILTER ?= false MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE endif - #PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include - #PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib + #BUILD_CPPFLAGS += -I$(TC_SYS_ROOT)/include + #BUILD_LDFLAGS += -L$(TC_SYS_ROOT)/lib else # we're not cross-compiling @@ -249,8 +249,8 @@ BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -W BUILD_LDFLAGS += -Wall ifeq ($(TARGET_ARCH),$(ARCH_32)) - PROJECT_CPPFLAGS += -m32 - PROJECT_LDFLAGS += -m32 + BUILD_CPPFLAGS += -m32 + BUILD_LDFLAGS += -m32 endif ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),) @@ -265,9 +265,9 @@ ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),) endif ifeq ($(TARGET_ARCH),armv7hl) - PROJECT_CPPFLAGS += -fPIC + BUILD_CPPFLAGS += -fPIC else ifeq ($(TARGET_ARCH),aarch64) - PROJECT_CPPFLAGS += -fPIC + BUILD_CPPFLAGS += -fPIC endif ifeq ($(DEVELOPMENT),true) @@ -278,7 +278,7 @@ ifeq ($(DEVELOPMENT),true) endif ifneq ($(LOG_QUAL_PREFIX),) - PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" + BUILD_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" endif ifeq ($(CATCH_ONLY_YERROR),true) @@ -292,47 +292,47 @@ endif ifeq ($(TARGET_TRIPLET),arm-none-eabi) ifeq ($(TARGET_CPU),cortex-m3) - PROJECT_CPPFLAGS += -mcpu=cortex-m3 -mthumb - PROJECT_LDFLAGS += -mcpu=cortex-m3 -mthumb + BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb + BUILD_LDFLAGS += -mcpu=cortex-m3 -mthumb else ifeq ($(TARGET_CPU),cortex-m4) - PROJECT_CPPFLAGS += -mcpu=cortex-m4 -mthumb - PROJECT_LDFLAGS += -mcpu=cortex-m4 -mthumb + BUILD_CPPFLAGS += -mcpu=cortex-m4 -mthumb + BUILD_LDFLAGS += -mcpu=cortex-m4 -mthumb else ifeq ($(TARGET_CPU),cortex-m7) - PROJECT_CPPFLAGS += -mcpu=cortex-m7 -mthumb - PROJECT_LDFLAGS += -mcpu=cortex-m7 -mthumb + BUILD_CPPFLAGS += -mcpu=cortex-m7 -mthumb + BUILD_LDFLAGS += -mcpu=cortex-m7 -mthumb endif ifneq ($(findstring cortex-m,$(TARGET_CPU)),) # don't wrap error message lines - #PROJECT_LDFLAGS += -fmessage-length=0 + #BUILD_LDFLAGS += -fmessage-length=0 # don't know what kind of optimization that is - #PROJECT_LDFLAGS += -Og + #BUILD_LDFLAGS += -Og # stick with what janware code tends to expect - PROJECT_LDFLAGS += -fsigned-char + BUILD_LDFLAGS += -fsigned-char # I have no clue which part would evaluate these names - PROJECT_LDFLAGS += -ffunction-sections - PROJECT_LDFLAGS += -fdata-sections - PROJECT_LDFLAGS += -ffreestanding - PROJECT_LDFLAGS += -fno-move-loop-invariants + BUILD_LDFLAGS += -ffunction-sections + BUILD_LDFLAGS += -fdata-sections + BUILD_LDFLAGS += -ffreestanding + BUILD_LDFLAGS += -fno-move-loop-invariants # skip any automatic initialization - PROJECT_LDFLAGS += -nostartfiles + BUILD_LDFLAGS += -nostartfiles # garbage collect unused input sections - PROJECT_LDFLAGS += -Xlinker --gc-sections - #PROJECT_LDFLAGS += -Xlinker --print-gc-sections + BUILD_LDFLAGS += -Xlinker --gc-sections + #BUILD_LDFLAGS += -Xlinker --print-gc-sections # create map file - PROJECT_LDFLAGS += -Wl,-Map,"$(EXE_MAP)" + BUILD_LDFLAGS += -Wl,-Map,"$(EXE_MAP)" # use newlib-nano, provides symbols _write _close _fstat _isatty _lseek (at least) # (TODO: No -Wl necessary?) - PROJECT_LDFLAGS += --specs=nano.specs - PROJECT_LDFLAGS += --specs=nosys.specs + BUILD_LDFLAGS += --specs=nano.specs + BUILD_LDFLAGS += --specs=nosys.specs endif @@ -413,7 +413,7 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi) endif -PROJECT_LDFLAGS += $(addprefix -u ,$(LD_DEFINE_SYMBOLS)) +BUILD_LDFLAGS += $(addprefix -u ,$(LD_DEFINE_SYMBOLS)) # -- target files and dirs @@ -661,21 +661,21 @@ ifeq ($(STRIP_SYMBOLS),true) STRIP_DONE ?= strip.done endif -BUILD_INCLUDE += $(LOCAL_INCLUDE) +BUILD_INCLUDE += $(LOCAL_INCLUDE) # force use of double quotes, allow header namespaces ifeq ($(HDRDIR_SCOPE_SUFFIX),) - BUILD_INCLUDE += -I. + BUILD_INCLUDE += -I. else - BUILD_INCLUDE += -iquote . + BUILD_INCLUDE += -iquote . endif ifeq ($(USE_PROJECT_LIB),true) - BUILD_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include + BUILD_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include BUILD_LIBFLAGS += -L$(BUILD_LIBDIR) endif -BUILD_INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) +BUILD_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)) @@ -695,7 +695,7 @@ ifeq ($(USE_FFTW),true) endif ifeq ($(USE_GLIB),true) - PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) + BUILD_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) BUILD_LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0) endif @@ -714,9 +714,10 @@ ifeq ($(CC),$(GCC)) endif BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(BUILD_INCLUDE) -BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(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) + #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/main.mk b/make/main.mk index 060afbaf..7dcb1f2e 100644 --- a/make/main.mk +++ b/make/main.mk @@ -1,7 +1,7 @@ EXE = $(PROJECT) ifneq ($(TARGET),mingw) -LOCAL_LDFLAGS += -rdynamic +BUILD_LDFLAGS += -rdynamic endif include $(MODDIR)/make/exe.mk diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk index 755e0ecf..83e962f8 100644 --- a/make/plugin-defs.mk +++ b/make/plugin-defs.mk @@ -23,5 +23,5 @@ 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 -PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive +BUILD_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive endif diff --git a/make/plugin.mk b/make/plugin.mk index 96efb54e..eda3ed78 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 -LOCAL_CXXFLAGS += -D_PLUGIN -LOCAL_CFLAGS += -D_PLUGIN +BUILD_CXXFLAGS += -D_PLUGIN +BUILD_CFLAGS += -D_PLUGIN all: build_LIB install: install_LIB diff --git a/make/profiler-defs.mk b/make/profiler-defs.mk index 2708e76b..a7967629 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) - PROJECT_CXXFLAGS += -pg - PROJECT_CFLAGS += -pg - PROJECT_LDFLAGS += -pg + BUILD_CXXFLAGS += -pg + BUILD_CFLAGS += -pg + BUILD_LDFLAGS += -pg clean: clean.gprof endif ifeq ($(COMPILER_SUITE),gcc) ifeq ($(USE_GCOV),true) - PROJECT_CXXFLAGS += -fprofile-arcs -ftest-coverage - PROJECT_CFLAGS += -fprofile-arcs -ftest-coverage - PROJECT_LDFLAGS += -fprofile-arcs -ftest-coverage + BUILD_CXXFLAGS += -fprofile-arcs -ftest-coverage + BUILD_CFLAGS += -fprofile-arcs -ftest-coverage + BUILD_LDFLAGS += -fprofile-arcs -ftest-coverage clean: clean.gcov endif endif ifeq ($(COMPILER_SUITE),clang) ifeq ($(USE_XRAY),true) - PROJECT_CXXFLAGS += -fxray-instrument -fxray-instruction-threshold=1 - PROJECT_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 - #PROJECT_LDFLAGS += -fxray-instrument + BUILD_CXXFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + BUILD_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + #BUILD_LDFLAGS += -fxray-instrument endif endif diff --git a/make/proj.mk b/make/proj.mk index fd5e525c..dac2989b 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -41,4 +41,4 @@ endif PREREQ_BUILD += jw-build USE_GLIB = true -PROJECT_CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS +BUILD_CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS diff --git a/make/qt-defs.mk b/make/qt-defs.mk index 847b78a0..116a01a9 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -125,7 +125,7 @@ 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)) +BUILD_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)) -LOCAL_CFLAGS += -fPIC -LOCAL_CXXFLAGS += -fPIC +BUILD_CFLAGS += -fPIC +BUILD_CXXFLAGS += -fPIC endif UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES)) diff --git a/make/run.mk b/make/run.mk index a4511855..48e49431 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) -LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" -LOCAL_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" +BUILD_CFLAGS += -DEXE_NAME=\"$(EXE)\" +BUILD_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" # ----- linker scripts from tagged templates #BUILD_LD_DIR = $(wildcard $(firstword $(call $(TAGGED_TMPL_DIRS),ld))) @@ -43,11 +43,11 @@ LOCAL_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)) -#PROJECT_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) +#BUILD_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)) -PROJECT_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) +BUILD_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 69f28960..e26f07c4 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) + BUILD_INCLUDE += $(shell php-config --includes) INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions - LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function - LOCAL_CXXFLAGS += -Wno-unused-label -Wno-unused-function + BUILD_CFLAGS += -Wno-unused-label -Wno-unused-function + BUILD_CXXFLAGS += -Wno-unused-label -Wno-unused-function all: @@ -66,7 +66,7 @@ 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 python2) + BUILD_INCLUDE += $(shell pkg-config --cflags python2) BUILD_LDFLAGS += $(shell pkg-config --libs python2) $(shell php-config --ldflags --libs) INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) @@ -93,7 +93,7 @@ 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_INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux #BUILD_LDFLAGS += INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) @@ -107,7 +107,7 @@ else ifeq ($(SWIG_TARGET),perl) PERL_BASE_DIR ?= $(ENV_PREFIX)$(firstword $(wildcard /usr/lib64/perl5 /usr/lib/perl5)) PERL_CORE_DIR ?= $(firstword $(wildcard $(PERL_BASE_DIR)/$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE/ $(PERL_BASE_DIR)/CORE)) PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi - BUILD_INCLUDE += -I$(PERL_CORE_DIR) + BUILD_INCLUDE += -I$(PERL_CORE_DIR) SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT)) INSTALL_LIBDIR = $(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE) SWIG_MODULE_TARGET_DIR = $(PERL_VENDOR_DIR) @@ -147,8 +147,8 @@ SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MOD SWIG_DEFINES += -DNON_C_BINDING SWIG_OPTS += $(SWIG_DEFINES) -LOCAL_CFLAGS += $(SWIG_DEFINES) -LOCAL_CXXFLAGS += $(SWIG_DEFINES) +BUILD_CFLAGS += $(SWIG_DEFINES) +BUILD_CXXFLAGS += $(SWIG_DEFINES) # for depend.mk BUILD_OBJ = $(SWIG_OBJ) diff --git a/make/tools.mk b/make/tools.mk index 79843d2f..f667c53b 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 -LOCAL_CFLAGS += -D_USRDLL -DALL_EXPORTS -LOCAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS +BUILD_CFLAGS += -D_USRDLL -DALL_EXPORTS +BUILD_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 32e27074..d63e1887 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) - PROJECT_LDFLAGS += -lwtfcgi + BUILD_LDFLAGS += -lwtfcgi endif ifeq ($(USE_WT_HTTPD),true) - PROJECT_LDFLAGS += -lwthttp - PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES - PROJECT_CXXFLAGS += -DCONNECTOR_HTTP=YES + BUILD_LDFLAGS += -lwthttp + BUILD_CFLAGS += -DCONNECTOR_HTTP=YES + BUILD_CXXFLAGS += -DCONNECTOR_HTTP=YES endif ifeq ($(USE_WT_DBO),true) - PROJECT_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo + BUILD_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo endif - PROJECT_LDFLAGS += -lwt + BUILD_LDFLAGS += -lwt endif diff --git a/make/yapp.mk b/make/yapp.mk index 9a4653f6..975bfff8 100644 --- a/make/yapp.mk +++ b/make/yapp.mk @@ -7,7 +7,7 @@ YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS) YAPP_NAMESPACE ?= ifneq ($(TARGET),mingw) -LOCAL_LDFLAGS += -rdynamic +BUILD_LDFLAGS += -rdynamic endif include $(MODDIR)/make/exe.mk