janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

make: Replace BUILD_XXX make flag variables by FINAL_XXX

Browse source 
The following BUILD_XXX variables are renamed to their respective FINAL_XXX
counterparts, as that name is more expressive:

  BUILD_CFLAGS, BUILD_CPPFLAGS, BUILD_CXXFLAGS, BUILD_EXTRA_DEBUG_FLAGS,
  BUILD_INCLUDE, BUILD_LDFLAGS, BUILD_LIBFLAGS, BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-24 12:58:53 +00:00
commit 3365aa3db6
18 changed files with 249 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

24
make/swig.mk
View file

@ -29,10 +29,10 @@ ifeq ($(SWIG_TARGET),php)
endif
SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI)
BUILD_INCLUDE += $(shell php-config --includes)
FINAL_INCLUDE += $(shell php-config --includes)
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions
BUILD_CFLAGS += -Wno-unused-label -Wno-unused-function
BUILD_CXXFLAGS += -Wno-unused-label -Wno-unused-function
FINAL_CFLAGS += -Wno-unused-label -Wno-unused-function
FINAL_CXXFLAGS += -Wno-unused-label -Wno-unused-function
all:
@ -75,8 +75,8 @@ else ifeq ($(SWIG_TARGET),python)
SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC)
SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
BUILD_INCLUDE += $(shell pkg-config --cflags python$(PYTHON_VERSION))
BUILD_LDFLAGS += $(shell pkg-config --libs python$(PYTHON_VERSION))
FINAL_INCLUDE += $(shell pkg-config --cflags python$(PYTHON_VERSION))
FINAL_LDFLAGS += $(shell pkg-config --libs python$(PYTHON_VERSION))
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
@ -114,8 +114,8 @@ else ifeq ($(SWIG_TARGET),java)
#SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC)
#SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
BUILD_INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
#BUILD_LDFLAGS +=
FINAL_INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
#FINAL_LDFLAGS +=
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
@ -130,7 +130,7 @@ else ifeq ($(SWIG_TARGET),perl)
PERL_BASE_DIR ?= $(firstword $(wildcard $(addprefix $(BUILD_LIBS_PREFIX),/usr/lib64/perl5 /usr/lib/perl /usr/lib/perl5 /usr/lib/perl-native/perl)))
PERL_CORE_DIR ?= $(firstword $(wildcard $(addprefix $(PERL_BASE_DIR)/,$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE $(PERL_VERSION)/CORE CORE)))
PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi
BUILD_INCLUDE += -I$(PERL_CORE_DIR)
FINAL_INCLUDE += -I$(PERL_CORE_DIR)
SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT))
INSTALL_LIBDIR = $(ENV_PREFIX)$(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE)
SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)$(PERL_VENDOR_DIR)
@ -141,7 +141,7 @@ else
endif
SWIG_INCLUDE ?= $(filter-out -iquote .,$(BUILD_INCLUDE))
SWIG_INCLUDE ?= $(filter-out -iquote .,$(FINAL_INCLUDE))
SWIG_USE_CPP ?= true
ifeq ($(SWIG_USE_CPP),true)
@ -170,8 +170,8 @@ SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MOD
SWIG_DEFINES += -DNON_C_BINDING
SWIG_OPTS += $(SWIG_DEFINES)
BUILD_CFLAGS += $(SWIG_DEFINES)
BUILD_CXXFLAGS += $(SWIG_DEFINES)
FINAL_CFLAGS += $(SWIG_DEFINES)
FINAL_CXXFLAGS += $(SWIG_DEFINES)
# for depend.mk
BUILD_OBJ = $(SWIG_OBJ)
@ -191,7 +191,7 @@ $(SWIG_MODULE_WRAP_C): $(SWIG_INTERFACE_I)
$(SWIG_POSTPROCESS)
$(SWIG_MODULE_SO): $(SWIG_OBJ)
$(CXX) $^ -shared $(BUILD_LDFLAGS) -o $@
$(CXX) $^ -shared $(FINAL_LDFLAGS) -o $@
$(SWIG_MODULE_TARGET_DIR):
mkdir -p $@