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

12
make/swig.mk
View file

@ -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)