janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-29 08:02:48 +01:00
Code Activity

defs-cpp.mk: Some indentation cleanup

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 09:03:13 +00:00
commit 2c749020d1
1 changed files with 188 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

111
make/defs-cpp.mk
View file

@ -4,9 +4,9 @@ CREATE_DEVEL ?= true
COMPILER_SUITE ?= gcc COMPILER_SUITE ?= gcc
ifeq ($(ARCH),$(ARCH_32)) ifeq ($(ARCH),$(ARCH_32))
PROJECT_CFLAGS += -m32 PROJECT_CFLAGS += -m32
PROJECT_CPPFLAGS += -m32 PROJECT_CPPFLAGS += -m32
PROJECT_LDFLAGS += -m32 PROJECT_LDFLAGS += -m32
endif endif
ifeq ($(ARCH),armv7hl) ifeq ($(ARCH),armv7hl)
@ -49,13 +49,13 @@ BUILD_LDFLAGS += -Wall
LOG_QUAL_PREFIX ?= $(LOGID): LOG_QUAL_PREFIX ?= $(LOGID):
ifneq ($(LOG_QUAL_PREFIX),) ifneq ($(LOG_QUAL_PREFIX),)
PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(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)\" PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
endif endif
ifeq ($(CATCH_ONLY_YERROR),true) ifeq ($(CATCH_ONLY_YERROR),true)
BUILD_CFLAGS += -DCATCH_ONLY_YERROR BUILD_CFLAGS += -DCATCH_ONLY_YERROR
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
endif endif
SYSCFG_DIR ?= /etc/sysconfig SYSCFG_DIR ?= /etc/sysconfig
@ -103,7 +103,7 @@ else
STRIP ?= strip STRIP ?= strip
RANLIB ?= ranlib RANLIB ?= ranlib
AR ?= ar AR ?= ar
endif endif # ifeq ($(TARGET),mingw)
# compiler and linker # compiler and linker
# gcc # gcc
@ -123,11 +123,11 @@ LD_REV := $(word 3,$(LD_VERSION_NUMBERS))
CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual
ifneq ($(GCC_VERSION),4.1.0) ifneq ($(GCC_VERSION),4.1.0)
ifneq ($(GCC_VERSION),4.5.1) ifneq ($(GCC_VERSION),4.5.1)
BUILD_CFLAGS += -std=gnu99 BUILD_CFLAGS += -std=gnu99
BUILD_CPPFLAGS += -std=c++11 BUILD_CPPFLAGS += -std=c++11
#BUILD_CPPFLAGS += -Wsuggest-override #BUILD_CPPFLAGS += -Wsuggest-override
endif endif
endif endif
ifeq ($(shell test $(GCC_MAJOR) -ge 5; echo $$?),0) ifeq ($(shell test $(GCC_MAJOR) -ge 5; echo $$?),0)
@ -316,7 +316,7 @@ endif
ifeq ($(USE_STACK_PROTECTOR),true) ifeq ($(USE_STACK_PROTECTOR),true)
BUILD_CFLAGS += -fstack-protector-all BUILD_CFLAGS += -fstack-protector-all
BUILD_CPPFLAGS += -fstack-protector-all BUILD_CPPFLAGS += -fstack-protector-all
# BUILD_CFLAGS += -fstack-protector #BUILD_CFLAGS += -fstack-protector
endif endif
ifeq ($(USE_STACK_CHECKER),true) ifeq ($(USE_STACK_CHECKER),true)
@ -324,9 +324,7 @@ ifeq ($(USE_STACK_CHECKER),true)
BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer
BUILD_LDFLAGS += -fsanitize=address BUILD_LDFLAGS += -fsanitize=address
else
endif endif
endif endif
ifeq ($(USE_DBMALLOC),true) ifeq ($(USE_DBMALLOC),true)
@ -416,7 +414,7 @@ else
-O0 -g -fno-inline -fno-omit-frame-pointer \ -O0 -g -fno-inline -fno-omit-frame-pointer \
-fno-builtin -fno-optimize-sibling-calls \ -fno-builtin -fno-optimize-sibling-calls \
$(GCC_NO_OPT_FLAGS) $(GCC_NO_OPT_FLAGS)
# -fconserve-stack # -fconserve-stack
_NO_OPT_FLAGS = \ _NO_OPT_FLAGS = \
-O0 \ -O0 \
@ -453,8 +451,8 @@ else
endif endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += -L$(BUILD_LIBDIR) LIBFLAGS += -L$(BUILD_LIBDIR)
endif endif
INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
@ -469,11 +467,11 @@ endif
LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT)) LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT))
ifeq ($(USE_SNDFILE),true) ifeq ($(USE_SNDFILE),true)
LIBFLAGS += -lsndfile LIBFLAGS += -lsndfile
endif endif
ifeq ($(USE_FFTW),true) ifeq ($(USE_FFTW),true)
LIBFLAGS += -lfftw3 LIBFLAGS += -lfftw3
endif endif
ifeq ($(USE_GLIB),true) ifeq ($(USE_GLIB),true)
@ -495,15 +493,15 @@ ifeq ($(USE_GLIB),true)
endif endif
ifeq ($(CC),$(CLANG)) ifeq ($(CC),$(CLANG))
COMPILER_CFLAGS += $(CLANG_CFLAGS) COMPILER_CFLAGS += $(CLANG_CFLAGS)
COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS) COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS)
COMPILER_LDFLAGS += $(CLANG_LDFLAGS) COMPILER_LDFLAGS += $(CLANG_LDFLAGS)
endif endif
ifeq ($(CC),$(GCC)) ifeq ($(CC),$(GCC))
COMPILER_CFLAGS += $(GCC_CFLAGS) COMPILER_CFLAGS += $(GCC_CFLAGS)
COMPILER_CPPFLAGS += $(GCC_CPPFLAGS) COMPILER_CPPFLAGS += $(GCC_CPPFLAGS)
COMPILER_LDFLAGS += $(GCC_LDFLAGS) COMPILER_LDFLAGS += $(GCC_LDFLAGS)
endif endif
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE)
@ -532,36 +530,38 @@ endif
LIBTYPE ?= shared LIBTYPE ?= shared
INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
LIBNAME ?= $(PROJECT) LIBNAME ?= $(PROJECT)
MEMBERS += $(LIB_A)($(OBJ)) MEMBERS += $(LIB_A)($(OBJ))
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
# TODO: use something like this as unifying variable, there are far too many # TODO: use something like this as unifying variable, there are far too many
# lib-related variables # lib-related variables
LOCAL_LIBS += LOCAL_LIBS +=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE) SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE)
SO_PREFIX ?= lib SO_PREFIX ?= lib
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO)) INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl #WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
WINRES_O = $(WINRES_RC).o WINRES_O = $(WINRES_RC).o
SO_SUFFIX = dll SO_SUFFIX = dll
SO_PREFIX ?= SO_PREFIX ?=
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
endif # mingw endif # mingw
BUILD_LIB += $(LIB_SO) BUILD_LIB += $(LIB_SO)
endif # USE_PROJECT_LIB endif # USE_PROJECT_LIB
INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO))) INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO)))
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp))
INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS)) INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
@ -570,4 +570,3 @@ INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \
$(INSTALLED_DEF) $(INSTALLED_DEF)