From 58ab619f0bdbf912dc874ee579adba4b0c86b892 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 19 Mar 2019 07:07:00 +0000 Subject: [PATCH] make: Rename CFLAGS, CXXFLAGS and CPPFLAGS variables Rename CFLAGS and friends to follow the conventions of the implicit rules defined by GNU Make: - $(CPPFLAGS) is passed to both C++ and C compiler - $(CXXFLAGS) is passed to C++ compiler only - $(CFLAGS) is passed to C compiler only - C++ compiler is in $(CXX) Signed-off-by: Jan Lindemann --- make/cpp-extra-targets.mk | 2 +- make/defs-cpp.mk | 90 ++++++++++++--------------------------- make/depend.mk | 8 ++-- make/lo.mk | 2 +- make/make.mk | 12 +++--- make/mcu-tags.mk | 2 +- make/plugin-defs.mk | 3 +- make/plugin-version.mk | 2 +- make/plugin.mk | 2 +- make/profiler-defs.mk | 6 +-- make/proj.mk | 12 ++---- make/qt-defs.mk | 6 +-- make/qt-rules.mk | 4 +- make/rules.mk | 19 +++++---- make/run.mk | 2 +- make/swig.mk | 6 +-- make/tools.mk | 2 +- make/wt-defs.mk | 2 +- 18 files changed, 71 insertions(+), 111 deletions(-) diff --git a/make/cpp-extra-targets.mk b/make/cpp-extra-targets.mk index 5e1a5b19..c28c43ce 100644 --- a/make/cpp-extra-targets.mk +++ b/make/cpp-extra-targets.mk @@ -3,6 +3,6 @@ CPP_EXTRA_TARGETS_MK_INCLUDED = true all: expand-macros: - make 2>/dev/null | sed '/$(CC)\|$(CPP)/ !d; s/$(CC)\|$(CPP)//; s/-o .*//' | grep -v "Wl\|rdynamic" | xargs $(CPP) -E -C | indent + make 2>/dev/null | sed '/$(CC)\|$(CXX)/ !d; s/$(CC)\|$(CXX)//; s/-o .*//' | grep -v "Wl\|rdynamic" | xargs $(CXX) -E -C | indent endif # ifndef CPP_EXTRA_TARGETS_MK_INCLUDED diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index 64bf47e5..f903b210 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -20,19 +20,14 @@ ifeq ($(COMPILER_SUITE),clang) endif ifeq ($(TARGET_ARCH),$(ARCH_32)) - PROJECT_CFLAGS += -m32 PROJECT_CPPFLAGS += -m32 PROJECT_LDFLAGS += -m32 endif ifeq ($(TARGET_ARCH),armv7hl) - PROJECT_CFLAGS += -fPIC PROJECT_CPPFLAGS += -fPIC - PROJECT_LDFLAGS += else ifeq ($(TARGET_ARCH),aarch64) - PROJECT_CFLAGS += -fPIC PROJECT_CPPFLAGS += -fPIC - PROJECT_LDFLAGS += endif ifeq ($(findstring $(TARGET_OS),linux),) @@ -55,22 +50,20 @@ USE_COMPILER_DEBUG_OPTS = true COMPILE_DEBUG_CODE = true BUILD_CFLAGS += $(CFLAGS) +BUILD_CXXFLAGS += $(CXXFLAGS) BUILD_CPPFLAGS += $(CPPFLAGS) BUILD_LDFLAGS += $(LDFLAGS) -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 LOG_QUAL_PREFIX ?= $(LOGID): ifneq ($(LOG_QUAL_PREFIX),) - PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" endif ifeq ($(CATCH_ONLY_YERROR),true) - BUILD_CFLAGS += -DCATCH_ONLY_YERROR BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR endif @@ -80,7 +73,6 @@ OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid USE_VERSION_MACROS ?= true ifeq ($(USE_VERSION_MACROS),true) - BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" endif @@ -101,7 +93,6 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- endif - PROJECT_CFLAGS += -D_WINDOWS PROJECT_CPPFLAGS += -D_WINDOWS BUILD_LDFLAGS += -lws2_32 WINDRES ?= $(TC_BIN_PREFIX)windres @@ -109,7 +100,6 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE endif - #PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include #PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include #PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib @@ -126,7 +116,6 @@ else # we're not cross-compiling endif ifeq ($(TARGET_ARCH),x86_64) - BUILD_CFLAGS += -fPIC BUILD_CPPFLAGS += -fPIC LIBFLAGS += endif @@ -138,9 +127,8 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi) ARM_NONE_EABI_ALLFLAGS += -fno-exceptions ARM_NONE_EABI_ALLFLAGS += -Os BUILD_LDFLAGS += $(ARM_NONE_EABI_ALLFLAGS) - BUILD_CFLAGS += $(ARM_NONE_EABI_ALLFLAGS) BUILD_CPPFLAGS += $(ARM_NONE_EABI_ALLFLAGS) - BUILD_CPPFLAGS += -fno-rtti + BUILD_CXXFLAGS += -fno-rtti # -- used by modm, but currently disabled for test purposes #BUILD_CFLAGS += -fno-threadsafe-statics @@ -168,9 +156,9 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi) #BUILD_CFLAGS += -Wundef - #BUILD_CPPFLAGS += -fdata-sections - #BUILD_CPPFLAGS += -ffunction-sections - #BUILD_CPPFLAGS += -finline-limit=10000 + #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 @@ -188,28 +176,28 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi) #BUILD_CPPFLAGS += -Werror=sign-compare #BUILD_CPPFLAGS += -Wextra #BUILD_CPPFLAGS += -Wlogical-op - #BUILD_CPPFLAGS += -Wpointer-arith + #BUILD_CXXFLAGS += -Wpointer-arith #BUILD_CPPFLAGS += -Wundef - #BUILD_CPPFLAGS += -fno-threadsafe-statics + #BUILD_CXXFLAGS += -fno-threadsafe-statics #BUILD_CPPFLAGS += -fno-unwind-tables - #BUILD_CPPFLAGS += -fstrict-enums + #BUILD_CXXFLAGS += -fstrict-enums #BUILD_CPPFLAGS += -fuse-cxa-atexit - #BUILD_CPPFLAGS += -std=c++17 - #BUILD_CPPFLAGS += -Woverloaded-virtual - #BUILD_CPPFLAGS += -fno-move-loop-invariants + #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 #BUILD_CPPFLAGS += -Og #BUILD_CPPFLAGS += -fno-exceptions - #BUILD_CPPFLAGS += -fno-rtti + #BUILD_CXXFLAGS += -fno-rtti endif ifeq ($(COMPILER_SUITE),gcc) GCC ?= $(TC_BIN_PREFIX)gcc - GPP ?= $(TC_BIN_PREFIX)g++ - CPP ?= $(GPP) + GXX ?= $(TC_BIN_PREFIX)g++ + CXX ?= $(GXX) GNU_LD ?= $(TC_BIN_PREFIX)ld CLANG ?= $(TC_BIN_PREFIX)clang CLANGPP ?= $(TC_BIN_PREFIX)clang++ @@ -237,28 +225,28 @@ ifeq ($(COMPILER_SUITE),gcc) #GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS)) CC = $(GCC) - CPP = $(GPP) - LD = $(GPP) + CXX = $(GXX) + LD = $(GXX) - BUILD_CPPFLAGS += -std=c++$(CPP_STANDARD_VERSION) + BUILD_CXXFLAGS += -std=c++$(CPP_STANDARD_VERSION) BUILD_CFLAGS += -std=gnu$(C_STANDARD_VERSION) ifeq ($(shell $(TEST) $(GCC_MAJOR) -ge 5; $(ECHO) $$?),0) ifeq ($(USE_CPP_FORCE_OVERRIDE),true) - GCC_CPPFLAGS += -Werror=suggest-override + GCC_CXXFLAGS += -Werror=suggest-override endif endif else ifeq ($(COMPILER_SUITE),clang) # clang - CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual + CLANG_CXXFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual CC = $(CLANG) - CPP = $(CLANGPP) + CXX = $(CLANGPP) LD = $(CLANGPP) ifeq ($(USE_CPP_WARN_INCONSISTENT_OVERRIDE),true) - CLANG_CPPFLAGS += -Winconsistent-missing-override + CLANG_CXXFLAGS += -Winconsistent-missing-override endif endif # COMPILER_SUITE @@ -302,14 +290,12 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) # == ifeq ($(DEVELOPMENT),true) - BUILD_CFLAGS += -D_DEVELOPMENT_ BUILD_CPPFLAGS += -D_DEVELOPMENT_ endif CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*)) ifeq ($(GCC_MAJOR),4) - BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY BUILD_CPPFLAGS += -DGCC_HASCLASSVISIBILITY endif @@ -328,7 +314,6 @@ endif ifeq ($(GCC_MAJOR),2) LPPFLAGS += -lm - BUILD_CFLAGS += -I/usr/local/include BUILD_CPPFLAGS += -I/usr/local/include else ifeq ($(GCC_MAJOR),3) @@ -340,7 +325,6 @@ else endif ifeq ($(TARGET),mingw) - BUILD_CFLAGS += -DWIN32 BUILD_CPPFLAGS += -DWIN32 # see https://stackoverflow.com/questions/4492799 BUILD_LDFLAGS += -fstack-protector @@ -351,7 +335,6 @@ endif GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh ifeq ($(LOG_THREAD_NAMES), true) - BUILD_CFLAGS += -DSLOG_THREAD_NAMES BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES endif @@ -362,7 +345,7 @@ endif ifeq ($(USE_GFILTER),true) GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt)) ifneq ($(strip $(GFILT)),sh) - GPP = $(GFILT) + GXX = $(GFILT) endif endif @@ -377,18 +360,15 @@ ifneq ($(filter jw-build,$(PREREQ_BUILD)),) endif ifeq ($(USE_SYSTEMD),true) - BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd) BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd) BUILD_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd) endif ifeq ($(USE_TIMER),true) - BUILD_CFLAGS += -D_USE_TIMER_ BUILD_CPPFLAGS += -D_USE_TIMER_ endif ifeq ($(USE_FAST_LOG),false) - BUILD_CFLAGS += -D_USE_FAST_LOG_=0 BUILD_CPPFLAGS += -D_USE_FAST_LOG_=0 endif @@ -397,13 +377,11 @@ ifeq ($(USE_YAMD),true) endif ifeq ($(USE_MPATROL),true) - BUILD_CFLAGS += -include /usr/include/mpatrol.h #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(USE_VALGRIND),true) - BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ # BUILD_LDFLAGS += endif @@ -413,14 +391,12 @@ ifeq ($(USE_MCHECK),true) endif ifeq ($(USE_STACK_PROTECTOR),true) - BUILD_CFLAGS += -fstack-protector-all BUILD_CPPFLAGS += -fstack-protector-all - #BUILD_CFLAGS += -fstack-protector + #BUILD_CPPFLAGS += -fstack-protector endif ifeq ($(USE_STACK_CHECKER),true) ifeq "$(COMPILER_SUITE)" "clang" - BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_LDFLAGS += -fsanitize=address endif @@ -428,67 +404,55 @@ endif ifeq ($(USE_DBMALLOC),true) CONTRIB_LIBS += dbmalloc - 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) - 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) - BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO endif ifeq ($(USE_EFENCE),true) - BUILD_CFLAGS += -DEFENCE BUILD_CPPFLAGS += -DEFENCE BUILD_LDFLAGS += -lefence endif ifeq ($(USE_TRACING),true) - BUILD_CFLAGS += -D_DO_TRACE_ BUILD_CPPFLAGS += -D_DO_TRACE_ endif ifeq ($(USE_ASSERTIONS),false) - BUILD_CFLAGS += -DNDEBUG BUILD_CPPFLAGS += -DNDEBUG endif ifeq ($(COMPILE_DEBUG_CODE),true) - BUILD_CFLAGS += -D_DEBUG_ BUILD_CPPFLAGS += -D_DEBUG_ endif ifeq ($(COMPILE_DEBUG_LOG),true) - BUILD_CFLAGS += -D_LOG_DEBUG_ BUILD_CPPFLAGS += -D_LOG_DEBUG_ endif ifeq ($(USE_MPATROL),true) - BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(BREAK_ABI),true) - BUILD_CFLAGS += -D_BREAK_ABI_ BUILD_CPPFLAGS += -D_BREAK_ABI_ endif ifeq ($(USE_STACK_CHECK),true) - BUILD_CFLAGS += -fstack-check BUILD_CPPFLAGS += -fstack-check endif ifeq ($(USE_COMPILER_DEBUG_OPTS),true) #BUILD_EXTRA_DEBUG_FLAGS += -gdwarf-2 - BUILD_CFLAGS += -g3 $(BUILD_EXTRA_DEBUG_FLAGS) BUILD_CPPFLAGS += -g3 $(BUILD_EXTRA_DEBUG_FLAGS) BUILD_LDFLAGS += -g3 $(BUILD_EXTRA_DEBUG_FLAGS) endif @@ -500,12 +464,10 @@ ifeq ($(CC),$(GCC)) -fno-early-inlining \ -fno-default-inline else ifeq ($(CC),$(CLANG)) - BUILD_CFLAGS += -Werror BUILD_CPPFLAGS += -Werror endif ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) - BUILD_CFLAGS += -funroll-loops -O3 BUILD_CPPFLAGS += -funroll-loops -O3 else ifeq ($(USE_DISABLE_COMPILER_OPTIMISATION_OPTS),true) NO_OPT_FLAGS = \ @@ -528,7 +490,6 @@ else ifeq ($(USE_DISABLE_COMPILER_OPTIMISATION_OPTS),true) -fno-inline-functions \ $(GCC_NO_OPT_FLAGS) - BUILD_CFLAGS += $(NO_OPT_FLAGS) BUILD_CPPFLAGS += $(NO_OPT_FLAGS) BUILD_LDFLAGS += $(NO_OPT_FLAGS) endif @@ -578,7 +539,6 @@ ifeq ($(USE_FFTW),true) endif ifeq ($(USE_GLIB),true) - PROJECT_CFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0) endif @@ -586,23 +546,27 @@ endif ifeq ($(CC),$(CLANG)) COMPILER_CFLAGS += $(CLANG_CFLAGS) COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS) + COMPILER_CXXFLAGS += $(CLANG_CXXFLAGS) COMPILER_LDFLAGS += $(CLANG_LDFLAGS) endif ifeq ($(CC),$(GCC)) COMPILER_CFLAGS += $(GCC_CFLAGS) COMPILER_CPPFLAGS += $(GCC_CPPFLAGS) + COMPILER_CXXFLAGS += $(GCC_CXXFLAGS) COMPILER_LDFLAGS += $(GCC_LDFLAGS) endif BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE) +BUILD_CXXFLAGS += $(LOCAL_CXXFLAGS) $(PROJECT_CXXFLAGS) $(COMPILER_CXXFLAGS) $(INCLUDE) BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(LPPFLAGS) $(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) # -- LIB diff --git a/make/depend.mk b/make/depend.mk index 89fea930..e6d13fc0 100644 --- a/make/depend.mk +++ b/make/depend.mk @@ -1,6 +1,6 @@ # variables DEPEND_CFLAGS += -D__MAKEDEPEND__ -DEPEND_CPPFLAGS += -D__MAKEDEPEND__ +DEPEND_CXXFLAGS += -D__MAKEDEPEND__ DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(OBJ))) ifeq ($(DEPEND_MK_INCLUDED),) @@ -27,13 +27,13 @@ endif %.o: .%.o.dep.mk .%.o.dep.mk: %.cpp $(BUILD_HDR) - $(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + $(CC) -M $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ .%.o.dep.mk: %.cc $(BUILD_HDR) - $(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + $(CC) -M $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ .%.o.dep.mk: %.c $(BUILD_HDR) - $(CC) -M $(BUILD_CFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + $(CC) -M $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(DEPEND_CXXFLAGS) $< -o $@ show-vars: show-vars-depend-mk show-vars-depend-mk: diff --git a/make/lo.mk b/make/lo.mk index 08fe7c0f..0ce5b371 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) - $(CPP) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ + $(CXX) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ %.cpp: $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)%$(CPP_SUFFIX).h echo "#include \"$<\"" > $@.tmp diff --git a/make/make.mk b/make/make.mk index 99f2c5f0..ae3240f5 100644 --- a/make/make.mk +++ b/make/make.mk @@ -13,8 +13,8 @@ CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME include $(MODDIR)/make/cache.mk ifneq ($(CREATE_DEVEL),false) - MKFILES += $(wildcard project.conf) - DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG + MKFILES += $(wildcard project.conf) + DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG endif include $(MODDIR)/make/rules.mk @@ -24,12 +24,12 @@ include $(MODDIR)/make/rules.mk INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d ifneq ($(wildcard pckg-deps.mk),) - INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk + INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk endif INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d ifneq ($(wildcard pckg-defs.mk),) - INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk + INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk endif #all: $(BUILD_PKG_CONFIG) @@ -55,8 +55,8 @@ do-install-links: @$(call install_links,MAKE) ifeq ($(EXPORT_PROJECT_LIB),true) - CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include" - CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" + CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include" + CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" endif $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh diff --git a/make/mcu-tags.mk b/make/mcu-tags.mk index 5220c3a8..c228387e 100644 --- a/make/mcu-tags.mk +++ b/make/mcu-tags.mk @@ -39,7 +39,7 @@ ifneq ($(findstring cortex-m3,$(TAGGED_TMPL_TAGS)),) endif ifneq ($(findstring gnu-mcu-eclipse,$(TAGGED_TMPL_TAGS)),) - LD_DEFINE_SYMBOLS += _sbrk + LD_DEFINE_SYMBOLS += _sbrk endif # ----- build options based on product choices diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk index e8eee125..755e0ecf 100644 --- a/make/plugin-defs.mk +++ b/make/plugin-defs.mk @@ -17,8 +17,7 @@ endif PLUGIN_PREFIX_AND_API ?= $(PLUGIN_PREFIX_)$(PLUGIN_API) PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) -CFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" -CPPFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" +BUILD_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 diff --git a/make/plugin-version.mk b/make/plugin-version.mk index ff68f376..5e3a22ef 100644 --- a/make/plugin-version.mk +++ b/make/plugin-version.mk @@ -8,7 +8,7 @@ clean: clean.local distclean: version.o: version.cpp - $(CPP) $(BUILD_CPPFLAGS) -o $@ -c $< + $(CXX) $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS) -o $@ -c $< clean.local: $(RM) -f version.o diff --git a/make/plugin.mk b/make/plugin.mk index 4211ef5f..96efb54e 100644 --- a/make/plugin.mk +++ b/make/plugin.mk @@ -13,7 +13,7 @@ include $(MODDIR)/make/depend.mk include $(MODDIR)/make/backup.mk include $(MODDIR)/make/dev-utils.mk -LOCAL_CPPFLAGS += -D_PLUGIN +LOCAL_CXXFLAGS += -D_PLUGIN LOCAL_CFLAGS += -D_PLUGIN all: build_LIB diff --git a/make/profiler-defs.mk b/make/profiler-defs.mk index c1a289ce..2708e76b 100644 --- a/make/profiler-defs.mk +++ b/make/profiler-defs.mk @@ -6,7 +6,7 @@ CALLGRIND_OUT ?= callgrind.out OPROF_OUT_DIR ?= oprofile-data ifeq ($(USE_GPROF),true) - PROJECT_CPPFLAGS += -pg + PROJECT_CXXFLAGS += -pg PROJECT_CFLAGS += -pg PROJECT_LDFLAGS += -pg clean: clean.gprof @@ -14,7 +14,7 @@ endif ifeq ($(COMPILER_SUITE),gcc) ifeq ($(USE_GCOV),true) - PROJECT_CPPFLAGS += -fprofile-arcs -ftest-coverage + PROJECT_CXXFLAGS += -fprofile-arcs -ftest-coverage PROJECT_CFLAGS += -fprofile-arcs -ftest-coverage PROJECT_LDFLAGS += -fprofile-arcs -ftest-coverage clean: clean.gcov @@ -23,7 +23,7 @@ endif ifeq ($(COMPILER_SUITE),clang) ifeq ($(USE_XRAY),true) - PROJECT_CPPFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + PROJECT_CXXFLAGS += -fxray-instrument -fxray-instruction-threshold=1 PROJECT_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 #PROJECT_LDFLAGS += -fxray-instrument endif diff --git a/make/proj.mk b/make/proj.mk index a09ed816..fd5e525c 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -33,18 +33,12 @@ FTP_FILE_MODE = 644 FTP_DIR_MODE = 755 ifeq ($(DEVELOPMENT),true) - include $(TOPDIR)/make/cfg_dev.mk + include $(TOPDIR)/make/cfg_dev.mk else - include $(TOPDIR)/make/cfg_dist.mk + include $(TOPDIR)/make/cfg_dist.mk endif PREREQ_BUILD += jw-build USE_GLIB = true -CFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS -CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS - -#DEBUG_FORMAT_FLAG ?= -gstabs+ -PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG) -PROJECT_CPPFLAGS += $(DEBUG_FORMAT_FLAG) -PROJECT_LDFLAGS += $(DEBUG_FORMAT_FLAG) +PROJECT_CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS diff --git a/make/qt-defs.mk b/make/qt-defs.mk index cc3f7d2b..b6c5e1fa 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -1,7 +1,7 @@ ifeq ($(USE_QT),true) USE_X = true -CPPFLAGS += -DQT_THREAD_SUPPORT +BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT #ifeq ($(PKG_FORMAT),rpm) #QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt) @@ -126,7 +126,7 @@ UIC ?= $(QT_BIN_PREFIX)/uic RCC ?= $(QT_BIN_PREFIX)/rcc LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) -CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) +CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) # ------------------------------- jw-build defs @@ -146,7 +146,7 @@ UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES)) else UIC_H += $(patsubst %.ui,%.h, $(UIFILES)) LOCAL_CFLAGS += -fPIC -LOCAL_CPPFLAGS += -fPIC +LOCAL_CXXFLAGS += -fPIC endif UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES)) diff --git a/make/qt-rules.mk b/make/qt-rules.mk index c71303cf..9f9d1575 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_CPPFLAGS))) -o $@ $< + $(MOC) $(filter -D% -I%,$(strip $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS))) -o $@ $< moc_%.cpp: include/%.h - $(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $< + $(MOC) $(filter -D% -I%,$(strip $(BUILD_CXXFLAGS) $(BUILD_CPPFLAGS))) -o $@ $< endif rcc_%.cpp: %.qrc diff --git a/make/rules.mk b/make/rules.mk index 128a76c8..4622c217 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -181,11 +181,14 @@ echo-cflags: @echo LOCAL_CFLAGS = $(LOCAL_CFLAGS) @echo PROJECT_CFLAGS = $(PROJECT_CFLAGS) @echo BUILD_CFLAGS = $(BUILD_CFLAGS) + @echo LOCAL_CXXFLAGS = $(LOCAL_CXXFLAGS) + @echo PROJECT_CXXFLAGS = $(PROJECT_CXXFLAGS) + @echo BUILD_CXXFLAGS = $(BUILD_CXXFLAGS) @echo LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS) @echo PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS) @echo BUILD_CPPFLAGS = $(BUILD_CPPFLAGS) @echo REAL_CFLAGS = $(REAL_CFLAGS) - @echo REAL_CPPFLAGS = $(REAL_CPPFLAGS) + @echo REAL_CXXFLAGS = $(REAL_CXXFLAGS) echo-development: echo DEVELOPMENT = $(DEVELOPMENT) @@ -313,19 +316,19 @@ $(MSVCPP_IMPLIB): $(LIB_SO) endif $(FLAVOUR_PREFIX)%.o: %.cpp - $(CPP) $(REAL_CPPFLAGS) -c $< -o $@ + $(CXX) $(REAL_CXXFLAGS) $(REAL_CPPFLAGS) -c $< -o $@ $(FLAVOUR_PREFIX)%.o: %.cc - $(CPP) $(REAL_CPPFLAGS) -c $< -o $@ + $(CXX) $(REAL_CXXFLAGS) $(REAL_CPPFLAGS) -c $< -o $@ $(FLAVOUR_PREFIX)%.o: %.c - $(CC) $(REAL_CFLAGS) -c $< -o $@ + $(CC) $(REAL_CFLAGS) $(REAL_CPPFLAGS) -c $< -o $@ $(FLAVOUR_PREFIX)%.o: %.S - $(CC) $(REAL_CFLAGS) -c $< -o $@ + $(CC) $(REAL_CFLAGS) $(REAL_CPPFLAGS) -c $< -o $@ $(FLAVOUR_PREFIX)%.o: %.sx - $(CC) $(REAL_CFLAGS) -c $< -o $@ + $(CC) $(REAL_CFLAGS) $(REAL_CPPFLAGS) -c $< -o $@ $(LIB_A)(%.o): %.o $(AR) crU $(LIB_A) $< @@ -351,10 +354,10 @@ else endif $(EXE) $(EXE_BIN): - $(CPP) $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@ + $(CXX) $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@ $(PLUGIN) $(PLUGIN_LIB): - $(CPP) -shared $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@ + $(CXX) -shared $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@ # mkdir -p $(BUILD_LIBDIR) # $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR) diff --git a/make/run.mk b/make/run.mk index 40396727..83c107a2 100644 --- a/make/run.mk +++ b/make/run.mk @@ -30,7 +30,7 @@ EXE_PATH ?= ./$(EXE) CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf) LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" -LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\" +LOCAL_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" include $(MODDIR)/make/profiler.mk BUILD_HDR = diff --git a/make/swig.mk b/make/swig.mk index 222c86ed..3f41dc3b 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -32,7 +32,7 @@ ifeq ($(SWIG_TARGET),php) INCLUDE += $(shell php-config --includes) INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function - LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function + LOCAL_CXXFLAGS += -Wno-unused-label -Wno-unused-function all: @@ -148,7 +148,7 @@ 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_CPPFLAGS += $(SWIG_DEFINES) +LOCAL_CXXFLAGS += $(SWIG_DEFINES) # for depend.mk OBJ = $(SWIG_OBJ) @@ -168,7 +168,7 @@ $(SWIG_MODULE_WRAP_C): $(SWIG_INTERFACE_I) $(SWIG_POSTPROCESS) $(SWIG_MODULE_SO): $(SWIG_OBJ) - $(CPP) $^ -shared $(BUILD_LDFLAGS) -o $@ + $(CXX) $^ -shared $(BUILD_LDFLAGS) -o $@ $(SWIG_MODULE_TARGET_DIR)/%: % $(INSTALL) -p -o $(SWIG_TARGETOWNER) -g $(SWIG_TARGETGROUP) -m $(SWIG_TARGETMODE) $< $@ diff --git a/make/tools.mk b/make/tools.mk index 6299ae61..79843d2f 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -13,7 +13,7 @@ include $(MODDIR)/make/backup.mk include $(MODDIR)/make/dev-utils.mk LOCAL_CFLAGS += -D_USRDLL -DALL_EXPORTS -LOCAL_CPPFLAGS += -D_USRDLL -DALL_EXPORTS +LOCAL_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 19cd0f48..32e27074 100644 --- a/make/wt-defs.mk +++ b/make/wt-defs.mk @@ -9,7 +9,7 @@ ifeq ($(USE_WT),true) ifeq ($(USE_WT_HTTPD),true) PROJECT_LDFLAGS += -lwthttp PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES - PROJECT_CPPFLAGS += -DCONNECTOR_HTTP=YES + PROJECT_CXXFLAGS += -DCONNECTOR_HTTP=YES endif ifeq ($(USE_WT_DBO),true)