mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
*.mk: Prefix non-env C/C++ flags with BUILD_
Prefix all CFLAGS / CPPFLAGS / LDFLAGS with BUILD_ to distinguish them from flags read from the environment (and getting longer and longer with +=).
This commit is contained in:
Jan Lindemann
parent
2b0a7b84bd
commit
634992f447
6 changed files with 94 additions and 94 deletions
152
make/defs.mk
152
make/defs.mk
|
|
@ -117,9 +117,9 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
|
||||
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
|
||||
LDFLAGS += -Wall
|
||||
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
|
||||
|
||||
ifneq ($(LOG_QUAL_PREFIX),)
|
||||
PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
|
||||
|
|
@ -127,8 +127,8 @@ PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\
|
|||
endif
|
||||
|
||||
ifeq ($(CATCH_ONLY_YERROR),true)
|
||||
CFLAGS += -DCATCH_ONLY_YERROR
|
||||
CPPFLAGS += -DCATCH_ONLY_YERROR
|
||||
BUILD_CFLAGS += -DCATCH_ONLY_YERROR
|
||||
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
|
||||
endif
|
||||
|
||||
ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9)
|
||||
|
|
@ -140,8 +140,8 @@ SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
|
|||
endif
|
||||
OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid
|
||||
|
||||
CFLAGS += -DVERSION=$(HEX_VERSION)
|
||||
CPPFLAGS += -DVERSION=$(HEX_VERSION)
|
||||
BUILD_CFLAGS += -DVERSION=$(HEX_VERSION)
|
||||
BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION)
|
||||
|
||||
ifeq ($(TARGET),mingw)
|
||||
CROSS_TOOL_DIR ?= /opt/cross-tools
|
||||
|
|
@ -152,7 +152,7 @@ STRIP = $(CROSS_TOOL_BIN_PREFIX)strip
|
|||
RANLIB = $(CROSS_TOOL_BIN_PREFIX)ranlib
|
||||
AR = $(CROSS_TOOL_BIN_PREFIX)ar
|
||||
WINDRES = $(CROSS_TOOL_BIN_PREFIX)windres
|
||||
LDFLAGS += -lws2_32
|
||||
BUILD_LDFLAGS += -lws2_32
|
||||
USE_GFILTER = false
|
||||
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
|
||||
LD = $(GPP)
|
||||
|
|
@ -445,15 +445,15 @@ endif
|
|||
# ==
|
||||
|
||||
ifeq ($(DEVELOPMENT),true)
|
||||
CFLAGS += -D_DEVELOPMENT_
|
||||
CPPFLAGS += -D_DEVELOPMENT_
|
||||
BUILD_CFLAGS += -D_DEVELOPMENT_
|
||||
BUILD_CPPFLAGS+= -D_DEVELOPMENT_
|
||||
endif
|
||||
|
||||
CORE += $(wildcard core core.* vgcore vgcore.*)
|
||||
|
||||
ifeq ($(GCC_MAJOR),4)
|
||||
CFLAGS += -DGCC_HASCLASSVISIBILITY
|
||||
CPPFLAGS += -DGCC_HASCLASSVISIBILITY
|
||||
BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY
|
||||
BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY
|
||||
endif
|
||||
|
||||
ifeq ($(USE_QT),true)
|
||||
|
|
@ -462,24 +462,24 @@ endif
|
|||
|
||||
ifeq ($(USE_X),true)
|
||||
ifeq ($(ARCH),x86)
|
||||
LDFLAGS += -L/usr/X11/lib -lXext -lX11
|
||||
BUILD_LDFLAGS += -L/usr/X11/lib -lXext -lX11
|
||||
else
|
||||
LDFLAGS += -L/usr/X11/lib64 -lXext -lX11
|
||||
BUILD_LDFLAGS += -L/usr/X11/lib64 -lXext -lX11
|
||||
endif
|
||||
endif
|
||||
|
||||
LPPFLAGS += -lstdc++
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CFLAGS += -fPIC
|
||||
CPPFLAGS += -fPIC
|
||||
BUILD_CFLAGS += -fPIC
|
||||
BUILD_CPPFLAGS+= -fPIC
|
||||
LIBFLAGS +=
|
||||
endif
|
||||
|
||||
ifeq ($(GCC_MAJOR),2)
|
||||
LPPFLAGS += -lm
|
||||
CFLAGS += -I/usr/local/include
|
||||
CPPFLAGS += -I/usr/local/include
|
||||
BUILD_CFLAGS += -I/usr/local/include
|
||||
BUILD_CPPFLAGS += -I/usr/local/include
|
||||
else
|
||||
ifeq ($(GCC_MAJOR),3)
|
||||
ifeq ($(GCC_MINOR),3)
|
||||
|
|
@ -491,7 +491,7 @@ endif
|
|||
|
||||
ifeq ($(LIBTYPE),shared)
|
||||
ifneq ($(TARGET),mingw)
|
||||
LDFLAGS += -rdynamic
|
||||
BUILD_LDFLAGS += -rdynamic
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -503,8 +503,8 @@ RM = rm
|
|||
AR = ar
|
||||
|
||||
ifeq ($(LOG_THREAD_NAMES), true)
|
||||
CFLAGS += -DSLOG_THREAD_NAMES
|
||||
CPPFLAGS += -DSLOG_THREAD_NAMES
|
||||
BUILD_CFLAGS += -DSLOG_THREAD_NAMES
|
||||
BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES
|
||||
endif
|
||||
|
||||
ifdef INSTALL_LOG
|
||||
|
|
@ -606,20 +606,20 @@ ifeq ($(USE_YTOOLS),true)
|
|||
endif
|
||||
|
||||
ifeq ($(USE_TIMER),true)
|
||||
CFLAGS += -D_USE_TIMER_
|
||||
CPPFLAGS += -D_USE_TIMER_
|
||||
BUILD_CFLAGS+= -D_USE_TIMER_
|
||||
BUILD_CPPFLAGS += -D_USE_TIMER_
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GCOV),true)
|
||||
CFLAGS += --coverage
|
||||
CPPFLAGS += --coverage
|
||||
LDFLAGS += --coverage
|
||||
BUILD_CFLAGS+= --coverage
|
||||
BUILD_CPPFLAGS += --coverage
|
||||
BUILD_LDFLAGS += --coverage
|
||||
endif
|
||||
|
||||
ifeq ($(USE_PROFILER),true)
|
||||
CFLAGS += -pg
|
||||
CPPFLAGS += -pg
|
||||
LDFLAGS += -pg
|
||||
BUILD_CFLAGS+= -pg
|
||||
BUILD_CPPFLAGS += -pg
|
||||
BUILD_LDFLAGS += -pg
|
||||
endif
|
||||
|
||||
ifeq ($(USE_YAMD),true)
|
||||
|
|
@ -627,91 +627,91 @@ ifeq ($(USE_YAMD),true)
|
|||
endif
|
||||
|
||||
ifeq ($(USE_MPATROL),true)
|
||||
CFLAGS += -include /usr/include/mpatrol.h
|
||||
#CPPFLAGS += -include /usr/include/mpatrol.h
|
||||
LDFLAGS += -lmpatrolmt -lbfd -liberty
|
||||
BUILD_CFLAGS+= -include /usr/include/mpatrol.h
|
||||
#BUILD_CPPFLAGS += -include /usr/include/mpatrol.h
|
||||
BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty
|
||||
endif
|
||||
|
||||
ifeq ($(USE_VALGRIND),true)
|
||||
#CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
|
||||
#CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
|
||||
# LDFLAGS +=
|
||||
#BUILD_CFLAGS+= -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
|
||||
#BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
|
||||
# BUILD_LDFLAGS +=
|
||||
endif
|
||||
|
||||
ifeq ($(USE_STACK_PROTECTOR),true)
|
||||
CFLAGS += -fstack-protector-all
|
||||
# CFLAGS += -fstack-protector
|
||||
BUILD_CFLAGS+= -fstack-protector-all
|
||||
# BUILD_CFLAGS+= -fstack-protector
|
||||
endif
|
||||
|
||||
ifeq ($(USE_DBMALLOC),true)
|
||||
CONTRIB_LIBS += dbmalloc
|
||||
CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc
|
||||
CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc
|
||||
LDFLAGS += -ldbmalloc
|
||||
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)
|
||||
CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT
|
||||
CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT
|
||||
LDFLAGS += -ldmallocthcxx -ldmallocth
|
||||
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)
|
||||
CFLAGS += -DMEMWATCH -DMW_STDIO
|
||||
CPPFLAGS += -DMEMWATCH -DMW_STDIO
|
||||
BUILD_CFLAGS+= -DMEMWATCH -DMW_STDIO
|
||||
BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO
|
||||
endif
|
||||
|
||||
ifeq ($(USE_EFENCE),true)
|
||||
CFLAGS += -DEFENCE
|
||||
CPPFLAGS += -DEFENCE
|
||||
LDFLAGS += -lefence
|
||||
BUILD_CFLAGS+= -DEFENCE
|
||||
BUILD_CPPFLAGS += -DEFENCE
|
||||
BUILD_LDFLAGS += -lefence
|
||||
endif
|
||||
|
||||
ifeq ($(USE_TRACING),true)
|
||||
CFLAGS += -D_DO_TRACE_
|
||||
CPPFLAGS += -D_DO_TRACE_
|
||||
BUILD_CFLAGS+= -D_DO_TRACE_
|
||||
BUILD_CPPFLAGS += -D_DO_TRACE_
|
||||
endif
|
||||
|
||||
ifeq ($(USE_ASSERTIONS),false)
|
||||
CFLAGS += -DNDEBUG
|
||||
CPPFLAGS += -DNDEBUG
|
||||
BUILD_CFLAGS+= -DNDEBUG
|
||||
BUILD_CPPFLAGS += -DNDEBUG
|
||||
endif
|
||||
|
||||
ifeq ($(COMPILE_DEBUG_CODE),true)
|
||||
CFLAGS += -D_DEBUG_
|
||||
CPPFLAGS += -D_DEBUG_
|
||||
BUILD_CFLAGS+= -D_DEBUG_
|
||||
BUILD_CPPFLAGS += -D_DEBUG_
|
||||
endif
|
||||
|
||||
ifeq ($(COMPILE_DEBUG_LOG),true)
|
||||
CFLAGS += -D_LOG_DEBUG_
|
||||
CPPFLAGS += -D_LOG_DEBUG_
|
||||
BUILD_CFLAGS+= -D_LOG_DEBUG_
|
||||
BUILD_CPPFLAGS += -D_LOG_DEBUG_
|
||||
endif
|
||||
|
||||
ifeq ($(USE_MPATROL),true)
|
||||
CFLAGS += -include $(MODDIR)/include/mpatrol.h
|
||||
CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
|
||||
LDFLAGS += -lmpatrolmt -lbfd -liberty
|
||||
BUILD_CFLAGS+= -include $(MODDIR)/include/mpatrol.h
|
||||
BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
|
||||
BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty
|
||||
endif
|
||||
|
||||
ifeq ($(BREAK_ABI),true)
|
||||
CFLAGS += -D_BREAK_ABI_
|
||||
CPPFLAGS += -D_BREAK_ABI_
|
||||
BUILD_CFLAGS+= -D_BREAK_ABI_
|
||||
BUILD_CPPFLAGS += -D_BREAK_ABI_
|
||||
endif
|
||||
|
||||
ifeq ($(USE_STACK_CHECK),true)
|
||||
CFLAGS += -fstack-check
|
||||
CPPFLAGS += -fstack-check
|
||||
BUILD_CFLAGS+= -fstack-check
|
||||
BUILD_CPPFLAGS += -fstack-check
|
||||
endif
|
||||
|
||||
ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
|
||||
CFLAGS += -g3 -ggdb
|
||||
CPPFLAGS += -g3 -ggdb
|
||||
LDFLAGS += -g3 -ggdb
|
||||
BUILD_CFLAGS+= -g3 -ggdb
|
||||
BUILD_CPPFLAGS += -g3 -ggdb
|
||||
BUILD_LDFLAGS += -g3 -ggdb
|
||||
endif
|
||||
|
||||
ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
|
||||
CFLAGS += -funroll-loops -O2
|
||||
CPPFLAGS += -funroll-loops -O2
|
||||
BUILD_CFLAGS+= -funroll-loops -O2
|
||||
BUILD_CPPFLAGS += -funroll-loops -O2
|
||||
else
|
||||
NO_OPT_FLAGS = \
|
||||
-fno-inline-functions-called-once \
|
||||
|
|
@ -731,14 +731,14 @@ else
|
|||
-fno-inline-functions-called-once \
|
||||
-fno-inline-functions \
|
||||
-fno-early-inlining
|
||||
CFLAGS += $(NO_OPT_FLAGS)
|
||||
CPPFLAGS += $(NO_OPT_FLAGS)
|
||||
LDFLAGS += $(NO_OPT_FLAGS)
|
||||
BUILD_CFLAGS+= $(NO_OPT_FLAGS)
|
||||
BUILD_CPPFLAGS += $(NO_OPT_FLAGS)
|
||||
BUILD_LDFLAGS += $(NO_OPT_FLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(USE_EXCEPTIONS_IN_C),true)
|
||||
CFLAGS += -fexceptions
|
||||
LDFLAGS += -shared-libgcc
|
||||
BUILD_CFLAGS+= -fexceptions
|
||||
BUILD_LDFLAGS += -shared-libgcc
|
||||
endif
|
||||
|
||||
ifeq ($(STRIP_SYMBOLS),true)
|
||||
|
|
@ -1305,9 +1305,9 @@ ifeq ($(USE_WT),true)
|
|||
LIBFLAGS += -L$(WT_JANNET_DIR)/lib -lwt-jannet -lwt -lwtext -lwthttp -lwtfcgi
|
||||
endif
|
||||
|
||||
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
|
||||
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
|
||||
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
|
||||
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
|
||||
BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
|
||||
BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
|
||||
#RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
|
||||
RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue