make: Modify only BUILD_*FLAGS in jw-build/make/*.mk

Assign only to BUILD_XXXFLAGS in jw-build/make/*.mk, and leave PROJECT_XXXFLAGS
and LOCAL_XXXFLAGS alone.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-10 06:43:40 +00:00
commit 49f269bdfe
12 changed files with 74 additions and 73 deletions

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)
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
BUILD_CFLAGS += -Wno-unused-label -Wno-unused-function
BUILD_CXXFLAGS += -Wno-unused-label -Wno-unused-function
all:
@ -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)
BUILD_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)
BUILD_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
BUILD_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)
@ -147,8 +147,8 @@ SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MOD
SWIG_DEFINES += -DNON_C_BINDING
SWIG_OPTS += $(SWIG_DEFINES)
LOCAL_CFLAGS += $(SWIG_DEFINES)
LOCAL_CXXFLAGS += $(SWIG_DEFINES)
BUILD_CFLAGS += $(SWIG_DEFINES)
BUILD_CXXFLAGS += $(SWIG_DEFINES)
# for depend.mk
BUILD_OBJ = $(SWIG_OBJ)