mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
make: Prefix BUILD_ to a couple of makefile variables
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:
parent
d3c5b11923
commit
17a080138c
8 changed files with 64 additions and 64 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# variables
|
||||
DEPEND_CFLAGS += -D__MAKEDEPEND__
|
||||
DEPEND_CXXFLAGS += -D__MAKEDEPEND__
|
||||
DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(OBJ)))
|
||||
DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(BUILD_OBJ)))
|
||||
|
||||
ifeq ($(DEPEND_MK_INCLUDED),)
|
||||
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ list-files:
|
|||
xargs -0 realpath ;\
|
||||
done
|
||||
$(TEXT_FILES_CACHE):
|
||||
@make text-files-update
|
||||
@make -s text-files-update
|
||||
text-files-update:
|
||||
@make -s --no-print-directory list-files | xargs file -N | grep ":.*text" | cut -d: -f1 > $(TEXT_FILES_CACHE).tmp
|
||||
mv $(TEXT_FILES_CACHE).tmp $(TEXT_FILES_CACHE)
|
||||
|
|
|
|||
|
|
@ -48,17 +48,17 @@ BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT
|
|||
#
|
||||
#ifdef REENTRANT
|
||||
# ifneq ($(QT_MAJOR_VERSION),4)
|
||||
# LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
|
||||
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
|
||||
# else
|
||||
# # LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
|
||||
# LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
|
||||
# # BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
|
||||
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
|
||||
# endif
|
||||
#else
|
||||
# ifneq ($(QT_MAJOR_VERSION),4)
|
||||
# LPPFLAGS += $(QT_LDFLAGS) -lqt
|
||||
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt
|
||||
# else
|
||||
# # LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
|
||||
# LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
|
||||
# # BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
|
||||
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
@ -124,8 +124,8 @@ QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODU
|
|||
MOC ?= $(QT_BIN_PREFIX)/moc
|
||||
UIC ?= $(QT_BIN_PREFIX)/uic
|
||||
RCC ?= $(QT_BIN_PREFIX)/rcc
|
||||
LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
|
||||
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
|
||||
BUILD_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
|
||||
BUILD_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
|
||||
CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
|
||||
|
||||
# ------------------------------- jw-build defs
|
||||
|
|
@ -150,8 +150,8 @@ LOCAL_CXXFLAGS += -fPIC
|
|||
endif
|
||||
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))
|
||||
|
||||
OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))
|
||||
OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
|
||||
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
|
||||
BUILD_OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))
|
||||
BUILD_OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
|
||||
BUILD_OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
|
||||
|
||||
endif # USE_QT
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ echo-ldflags:
|
|||
@echo "LOCAL_LDFLAGS = $(LOCAL_LDFLAGS)"
|
||||
@echo "PROJECTLIB_LDFLAGS = $(PROJECTLIB_LDFLAGS)"
|
||||
@echo "PROJECT_LDFLAGS = $(PROJECT_LDFLAGS)"
|
||||
@echo "LPPFLAGS = $(LPPFLAGS)"
|
||||
@echo "LIBFLAGS = $(LIBFLAGS)"
|
||||
@echo "BUILD_LPPFLAGS = $(BUILD_LPPFLAGS)"
|
||||
@echo "BUILD_LIBFLAGS = $(BUILD_LIBFLAGS)"
|
||||
@echo "QT_LDFLAGS = $(QT_LDFLAGS)"
|
||||
@echo "REAL_LDFLAGS = $(REAL_LDFLAGS)"
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ echo-modules:
|
|||
@echo "SCOPE_CASMIX = $(SCOPE_CASMIX_DIR)"
|
||||
|
||||
echo-include:
|
||||
@echo "INCLUDE : $(INCLUDE)"
|
||||
@echo "INCLUDE : $(BUILD_INCLUDE)"
|
||||
|
||||
echo-mk:
|
||||
@echo MAKEFILE_LIST = $(MAKEFILE_LIST)
|
||||
|
|
@ -329,27 +329,27 @@ $(LIB_A)(%.o): %.o
|
|||
$(AR) crU $(LIB_A) $<
|
||||
|
||||
ifneq ($(USE_QT),)
|
||||
$(OBJ): $(UIC_H) $(MOC_H) $(UIC_CPP) $(MOC_CPP) $(RCC_CPP)
|
||||
$(BUILD_OBJ): $(UIC_H) $(MOC_H) $(UIC_CPP) $(MOC_CPP) $(RCC_CPP)
|
||||
endif
|
||||
|
||||
ifeq ($(USE_PROJECT_LIB),true)
|
||||
ifeq ($(LIBTYPE),shared)
|
||||
$(EXE) $(EXE_BIN): $(OBJ) $(LD_SCRIPTS) $(LIB_SO)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LD_SCRIPTS) $(LIB_SO)
|
||||
$(EXE) $(EXE_BIN): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_SO)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_SO)
|
||||
else
|
||||
$(EXE) $(EXE_BIN): $(OBJ) $(LD_SCRIPTS) $(LIB_A)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LD_SCRIPTS) $(LIB_A)
|
||||
$(EXE) $(EXE_BIN): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_A)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_A)
|
||||
endif
|
||||
else
|
||||
$(EXE) $(EXE_BIN): $(OBJ) $(LD_SCRIPTS)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LD_SCRIPTS)
|
||||
$(EXE) $(EXE_BIN): $(BUILD_OBJ) $(LD_SCRIPTS)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(BUILD_OBJ) $(LD_SCRIPTS)
|
||||
endif
|
||||
|
||||
$(EXE) $(EXE_BIN):
|
||||
$(CXX) $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
|
||||
$(CXX) $(sort $(BUILD_OBJ)) $(REAL_LDFLAGS) -o $@
|
||||
|
||||
$(PLUGIN) $(PLUGIN_LIB):
|
||||
$(CXX) -shared $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
|
||||
$(CXX) -shared $(sort $(BUILD_OBJ)) $(REAL_LDFLAGS) -o $@
|
||||
# mkdir -p $(BUILD_LIBDIR)
|
||||
# $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)
|
||||
|
||||
|
|
|
|||
12
make/swig.mk
12
make/swig.mk
|
|
@ -29,7 +29,7 @@ ifeq ($(SWIG_TARGET),php)
|
|||
endif
|
||||
SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI)
|
||||
|
||||
INCLUDE += $(shell php-config --includes)
|
||||
BUILD_INCLUDE += $(shell php-config --includes)
|
||||
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions
|
||||
LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function
|
||||
LOCAL_CXXFLAGS += -Wno-unused-label -Wno-unused-function
|
||||
|
|
@ -66,7 +66,7 @@ else ifeq ($(SWIG_TARGET),python)
|
|||
SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC)
|
||||
SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
|
||||
|
||||
INCLUDE += $(shell pkg-config --cflags python2)
|
||||
BUILD_INCLUDE += $(shell pkg-config --cflags python2)
|
||||
BUILD_LDFLAGS += $(shell pkg-config --libs python2) $(shell php-config --ldflags --libs)
|
||||
|
||||
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
|
||||
|
|
@ -93,7 +93,7 @@ else ifeq ($(SWIG_TARGET),java)
|
|||
#SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC)
|
||||
#SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
|
||||
|
||||
INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
||||
BUILD_INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
||||
#BUILD_LDFLAGS +=
|
||||
|
||||
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
|
||||
|
|
@ -107,7 +107,7 @@ else ifeq ($(SWIG_TARGET),perl)
|
|||
PERL_BASE_DIR ?= $(ENV_PREFIX)$(firstword $(wildcard /usr/lib64/perl5 /usr/lib/perl5))
|
||||
PERL_CORE_DIR ?= $(firstword $(wildcard $(PERL_BASE_DIR)/$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE/ $(PERL_BASE_DIR)/CORE))
|
||||
PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi
|
||||
INCLUDE += -I$(PERL_CORE_DIR)
|
||||
BUILD_INCLUDE += -I$(PERL_CORE_DIR)
|
||||
SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT))
|
||||
INSTALL_LIBDIR = $(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE)
|
||||
SWIG_MODULE_TARGET_DIR = $(PERL_VENDOR_DIR)
|
||||
|
|
@ -118,7 +118,7 @@ else
|
|||
|
||||
endif
|
||||
|
||||
SWIG_INCLUDE ?= $(filter-out -iquote .,$(INCLUDE))
|
||||
SWIG_INCLUDE ?= $(filter-out -iquote .,$(BUILD_INCLUDE))
|
||||
|
||||
SWIG_USE_CPP ?= true
|
||||
ifeq ($(SWIG_USE_CPP),true)
|
||||
|
|
@ -151,7 +151,7 @@ LOCAL_CFLAGS += $(SWIG_DEFINES)
|
|||
LOCAL_CXXFLAGS += $(SWIG_DEFINES)
|
||||
|
||||
# for depend.mk
|
||||
OBJ = $(SWIG_OBJ)
|
||||
BUILD_OBJ = $(SWIG_OBJ)
|
||||
DEPEND_MK += $(SWIG_WRAPPER_DEP_MK)
|
||||
|
||||
all: $(SWIG_MODULE_SO) $(SWIG_GENERATED_EXTRA)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ ifeq ($(SCOPE_PREFIX),)
|
|||
endif
|
||||
|
||||
ifneq ($(TARGET),mingw)
|
||||
$(LIB_SO): $(OBJ)
|
||||
$(LIB_SO): $(BUILD_OBJ)
|
||||
endif
|
||||
|
||||
all.done: $(PREREQ_DONE) $(BUILD_HDR) $(BUILD_EXE_SH) $(MEMBERS) $(LIB_A) | $(HDRDIR_SCOPE_SUFFIX)
|
||||
|
|
@ -81,25 +81,25 @@ clang-tidy-clean:
|
|||
rm -f clang-tidy-cache*.tmp
|
||||
CLANG_TIDY_CACHE_CPP = clang-tidy-cache-cpp.tmp
|
||||
$(CLANG_TIDY_CACHE_CPP): $(LOCAL_CPP)
|
||||
$(CLANG_TIDY) $(LOCAL_CPP) -- $(INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@
|
||||
$(CLANG_TIDY) $(LOCAL_CPP) -- $(BUILD_INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@
|
||||
|
||||
clang-tidy-h-c-cpp:
|
||||
ifneq ($(CLANG_TIDY_H_C_CPP),)
|
||||
$(CLANG_TIDY) $(CLANG_TIDY_H_C_CPP) -- $(INCLUDE)
|
||||
$(CLANG_TIDY) $(CLANG_TIDY_H_C_CPP) -- $(BUILD_INCLUDE)
|
||||
endif
|
||||
clang-tidy-h-c:
|
||||
ifneq ($(CLANG_TIDY_H_C_C),)
|
||||
$(CLANG_TIDY) $(CLANG_TIDY_H_C) -- $(INCLUDE)
|
||||
$(CLANG_TIDY) $(CLANG_TIDY_H_C) -- $(BUILD_INCLUDE)
|
||||
endif
|
||||
clang-tidy-h-cpp:
|
||||
ifneq ($(CLANG_TIDY_H_CPP),)
|
||||
$(CLANG_TIDY) $(CLANG_TIDY_H_CPP) -- $(INCLUDE) -x c++
|
||||
$(CLANG_TIDY) $(CLANG_TIDY_H_CPP) -- $(BUILD_INCLUDE) -x c++
|
||||
endif
|
||||
clang-tidy-h: clang-tidy-h-c clang-tidy-h-cpp clang-tidy-h-c-cpp
|
||||
|
||||
clang-tidy-c:
|
||||
ifneq ($(LOCAL_C),)
|
||||
$(CLANG_TIDY) $(LOCAL_C) -- $(INCLUDE)
|
||||
$(CLANG_TIDY) $(LOCAL_C) -- $(BUILD_INCLUDE)
|
||||
endif
|
||||
clang-tidy-cpp: $(CLANG_TIDY_CACHE_CPP)
|
||||
cat $<
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ YAPP_INCLUDE_DIR ?= .
|
|||
YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \
|
||||
$(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h)))))
|
||||
YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
|
||||
$(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
|
||||
$(YAPP_INCLUDE_DIR) $(subst -I,,$(BUILD_INCLUDE)))) $(YAPP_CLASS).h)
|
||||
YAPP_NAMESPACE ?=
|
||||
|
||||
ifneq ($(TARGET),mingw)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue