janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make: Prefix BUILD_ to a couple of makefile variables

Browse source 
Rename variables to avoid collision:

  OBJ      -> BUILD_OBJ
  INCLUDE  -> BUILD_INCLUDE
  LIBFLAGS -> BUILD_LIBFLAGS
  LPPFLAGS -> BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-08 18:26:45 +00:00
commit 17a080138c
8 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

52
make/defs-cpp.mk
View file

@ -43,7 +43,7 @@ else ifneq ($(findstring st-disc1-f429i,$(TAGGED_TMPL_TAGS)),)
TAGGED_TMPL_TAGS += cortex-m4
MCU_BOARD_MODEL ?= ST-DISC1-F429I
BUILD_CPPFLAGS += -DST_DISC1_F429I
#MCU_OPENOCD_CFG_NAME ?= openocd-st-stm32f429disc1.cfg
#MCU_OPENOCD_CFG_NAME ?= openocd-st-stm32f429disc1.cfg
MCU_OPENOCD_CFG_NAME ?= openocd-st-stm32f429discovery.cfg
MCU_FLASH_BANK_NAME ?= internal
ifeq ($(MCU_FLASH_BANK_NAME),internal)
@ -155,7 +155,7 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling
else # we're not cross-compiling
TC_SYS_ROOT ?= /usr
LIBFLAGS += -pthread
BUILD_LIBFLAGS += -pthread
endif
@ -257,9 +257,9 @@ ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),)
BUILD_CPPFLAGS += -fPIC
ifeq ($(findstring mingw,$(TARGET_ABI)),)
ifeq ($(LIBTYPE),shared)
LIBFLAGS += -ldl
BUILD_LIBFLAGS += -ldl
else
LIBFLAGS += -l:libdl.a
BUILD_LIBFLAGS += -l:libdl.a
endif
endif
endif
@ -430,8 +430,8 @@ ALL_H += $(LOCAL_H) $(PREREQ_H)
SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H)
SRC_C += $(filter %.c, $(SRC_ALL_CPP))
SRC_CPP += $(filter %.cc %.cpp %.C, $(SRC_ALL_CPP))
OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.C,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc %.C, $(SRC_ALL_CPP)))))))
OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.sx,%.o,$(patsubst %.S,%.o,$(SFILES))))
BUILD_OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.C,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc %.C, $(SRC_ALL_CPP)))))))
BUILD_OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.sx,%.o,$(patsubst %.S,%.o,$(SFILES))))
#PREREQ_C += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c))
#PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \
@ -465,17 +465,17 @@ ifeq ($(USE_X),true)
endif
ifneq ($(TARGET_TRIPLET),arm-none-eabi)
LPPFLAGS += -lstdc++
BUILD_LPPFLAGS += -lstdc++
endif
ifeq ($(GCC_MAJOR),2)
LPPFLAGS += -lm
BUILD_LPPFLAGS += -lm
BUILD_CPPFLAGS += -I/usr/local/include
else
ifeq ($(GCC_MAJOR),3)
ifeq ($(GCC_MINOR),3)
LPPFLAGS += -lgcc_s
# LPPFLAGS += -L/usr/local/gcc3.3/lib
BUILD_LPPFLAGS += -lgcc_s
# BUILD_LPPFLAGS += -L/usr/local/gcc3.3/lib
endif
endif
endif
@ -661,42 +661,42 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done
endif
INCLUDE += $(LOCAL_INCLUDE)
BUILD_INCLUDE += $(LOCAL_INCLUDE)
# force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I.
BUILD_INCLUDE += -I.
else
INCLUDE += -iquote .
BUILD_INCLUDE += -iquote .
endif
ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += -L$(BUILD_LIBDIR)
BUILD_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
BUILD_LIBFLAGS += -L$(BUILD_LIBDIR)
endif
INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
BUILD_INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE))
LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD))
BUILD_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD))
# the following is necessary, because not all projects have build.libname = none in project.conf
ifeq ($(USE_PROJECT_LIB),true)
LDFLAGS_QUERY_ARGS_SELF = --add-self
endif
LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT))
BUILD_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT))
ifeq ($(USE_SNDFILE),true)
LIBFLAGS += -lsndfile
BUILD_LIBFLAGS += -lsndfile
endif
ifeq ($(USE_FFTW),true)
LIBFLAGS += -lfftw3
BUILD_LIBFLAGS += -lfftw3
endif
ifeq ($(USE_GLIB),true)
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0)
BUILD_LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0)
endif
ifeq ($(CC),$(CLANG))
@ -713,10 +713,10 @@ ifeq ($(CC),$(GCC))
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)
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(BUILD_INCLUDE)
BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(BUILD_INCLUDE)
BUILD_CXXFLAGS += $(LOCAL_CXXFLAGS) $(PROJECT_CXXFLAGS) $(COMPILER_CXXFLAGS) $(BUILD_INCLUDE)
BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(BUILD_LPPFLAGS) $(BUILD_LIBFLAGS)
#RPM_REQUIRES = $(shell $(ECHO) "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
@ -756,7 +756,7 @@ endif
ifeq ($(USE_PROJECT_LIB),true)
LIBNAME ?= $(PROJECT)
MEMBERS += $(LIB_A)($(OBJ))
MEMBERS += $(LIB_A)($(BUILD_OBJ))
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
# TODO: use something like this as unifying variable, there are far too many
# lib-related variables