janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 07:13:55 +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

7
make/defs-cpp.mk
View file

@ -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
@ -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)
@ -532,6 +530,7 @@ 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))
@ -562,6 +561,7 @@ 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)