mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
defs-cpp.mk: Some indentation cleanup
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
22d89ef234
commit
2c749020d1
1 changed files with 188 additions and 189 deletions
111
make/defs-cpp.mk
111
make/defs-cpp.mk
|
|
@ -4,9 +4,9 @@ CREATE_DEVEL ?= true
|
|||
COMPILER_SUITE ?= gcc
|
||||
|
||||
ifeq ($(ARCH),$(ARCH_32))
|
||||
PROJECT_CFLAGS += -m32
|
||||
PROJECT_CPPFLAGS += -m32
|
||||
PROJECT_LDFLAGS += -m32
|
||||
PROJECT_CFLAGS += -m32
|
||||
PROJECT_CPPFLAGS += -m32
|
||||
PROJECT_LDFLAGS += -m32
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),armv7hl)
|
||||
|
|
@ -49,13 +49,13 @@ 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)\"
|
||||
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
|
||||
BUILD_CFLAGS += -DCATCH_ONLY_YERROR
|
||||
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
|
||||
endif
|
||||
|
||||
SYSCFG_DIR ?= /etc/sysconfig
|
||||
|
|
@ -103,7 +103,7 @@ else
|
|||
STRIP ?= strip
|
||||
RANLIB ?= ranlib
|
||||
AR ?= ar
|
||||
endif
|
||||
endif # ifeq ($(TARGET),mingw)
|
||||
|
||||
# compiler and linker
|
||||
# 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
|
||||
|
||||
ifneq ($(GCC_VERSION),4.1.0)
|
||||
ifneq ($(GCC_VERSION),4.5.1)
|
||||
BUILD_CFLAGS += -std=gnu99
|
||||
BUILD_CPPFLAGS += -std=c++11
|
||||
#BUILD_CPPFLAGS += -Wsuggest-override
|
||||
endif
|
||||
ifneq ($(GCC_VERSION),4.5.1)
|
||||
BUILD_CFLAGS += -std=gnu99
|
||||
BUILD_CPPFLAGS += -std=c++11
|
||||
#BUILD_CPPFLAGS += -Wsuggest-override
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(shell test $(GCC_MAJOR) -ge 5; echo $$?),0)
|
||||
|
|
@ -316,7 +316,7 @@ endif
|
|||
ifeq ($(USE_STACK_PROTECTOR),true)
|
||||
BUILD_CFLAGS += -fstack-protector-all
|
||||
BUILD_CPPFLAGS += -fstack-protector-all
|
||||
# BUILD_CFLAGS += -fstack-protector
|
||||
#BUILD_CFLAGS += -fstack-protector
|
||||
endif
|
||||
|
||||
ifeq ($(USE_STACK_CHECKER),true)
|
||||
|
|
@ -324,9 +324,7 @@ ifeq ($(USE_STACK_CHECKER),true)
|
|||
BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
BUILD_LDFLAGS += -fsanitize=address
|
||||
else
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(USE_DBMALLOC),true)
|
||||
|
|
@ -416,7 +414,7 @@ else
|
|||
-O0 -g -fno-inline -fno-omit-frame-pointer \
|
||||
-fno-builtin -fno-optimize-sibling-calls \
|
||||
$(GCC_NO_OPT_FLAGS)
|
||||
# -fconserve-stack
|
||||
# -fconserve-stack
|
||||
|
||||
_NO_OPT_FLAGS = \
|
||||
-O0 \
|
||||
|
|
@ -453,8 +451,8 @@ else
|
|||
endif
|
||||
|
||||
ifeq ($(USE_PROJECT_LIB),true)
|
||||
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
|
||||
LIBFLAGS += -L$(BUILD_LIBDIR)
|
||||
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
|
||||
LIBFLAGS += -L$(BUILD_LIBDIR)
|
||||
endif
|
||||
|
||||
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))
|
||||
|
||||
ifeq ($(USE_SNDFILE),true)
|
||||
LIBFLAGS += -lsndfile
|
||||
LIBFLAGS += -lsndfile
|
||||
endif
|
||||
|
||||
ifeq ($(USE_FFTW),true)
|
||||
LIBFLAGS += -lfftw3
|
||||
LIBFLAGS += -lfftw3
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GLIB),true)
|
||||
|
|
@ -495,15 +493,15 @@ ifeq ($(USE_GLIB),true)
|
|||
endif
|
||||
|
||||
ifeq ($(CC),$(CLANG))
|
||||
COMPILER_CFLAGS += $(CLANG_CFLAGS)
|
||||
COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS)
|
||||
COMPILER_LDFLAGS += $(CLANG_LDFLAGS)
|
||||
COMPILER_CFLAGS += $(CLANG_CFLAGS)
|
||||
COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS)
|
||||
COMPILER_LDFLAGS += $(CLANG_LDFLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(CC),$(GCC))
|
||||
COMPILER_CFLAGS += $(GCC_CFLAGS)
|
||||
COMPILER_CPPFLAGS += $(GCC_CPPFLAGS)
|
||||
COMPILER_LDFLAGS += $(GCC_LDFLAGS)
|
||||
COMPILER_CFLAGS += $(GCC_CFLAGS)
|
||||
COMPILER_CPPFLAGS += $(GCC_CPPFLAGS)
|
||||
COMPILER_LDFLAGS += $(GCC_LDFLAGS)
|
||||
endif
|
||||
|
||||
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE)
|
||||
|
|
@ -532,36 +530,38 @@ endif
|
|||
|
||||
LIBTYPE ?= shared
|
||||
INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib
|
||||
|
||||
ifeq ($(USE_PROJECT_LIB),true)
|
||||
LIBNAME ?= $(PROJECT)
|
||||
MEMBERS += $(LIB_A)($(OBJ))
|
||||
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
|
||||
# TODO: use something like this as unifying variable, there are far too many
|
||||
# lib-related variables
|
||||
LOCAL_LIBS +=
|
||||
ifneq ($(TARGET),mingw)
|
||||
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
|
||||
SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE)
|
||||
SO_PREFIX ?= lib
|
||||
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
|
||||
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_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
else
|
||||
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
|
||||
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl
|
||||
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl
|
||||
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
|
||||
WINRES_O = $(WINRES_RC).o
|
||||
SO_SUFFIX = dll
|
||||
SO_PREFIX ?=
|
||||
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
|
||||
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
|
||||
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
|
||||
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
endif # mingw
|
||||
BUILD_LIB += $(LIB_SO)
|
||||
LIBNAME ?= $(PROJECT)
|
||||
MEMBERS += $(LIB_A)($(OBJ))
|
||||
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
|
||||
# TODO: use something like this as unifying variable, there are far too many
|
||||
# lib-related variables
|
||||
LOCAL_LIBS +=
|
||||
ifneq ($(TARGET),mingw)
|
||||
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
|
||||
SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE)
|
||||
SO_PREFIX ?= lib
|
||||
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
|
||||
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_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
else
|
||||
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
|
||||
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl
|
||||
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl
|
||||
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
|
||||
WINRES_O = $(WINRES_RC).o
|
||||
SO_SUFFIX = dll
|
||||
SO_PREFIX ?=
|
||||
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
|
||||
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
|
||||
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
|
||||
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
endif # mingw
|
||||
BUILD_LIB += $(LIB_SO)
|
||||
endif # USE_PROJECT_LIB
|
||||
|
||||
INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO)))
|
||||
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp))
|
||||
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_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \
|
||||
$(INSTALLED_DEF)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue