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

rules.mk, swig.mk: Add dependencies for Debian Stretch / Unstable

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-12-28 20:07:25 +00:00
commit 7ffe0c4b81
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/rules.mk
View file

@ -298,7 +298,7 @@ $(FLAVOUR_PREFIX)%.o: %.S
$(CC) $(BUILD_CFLAGS) -c $< -o $@ $(CC) $(BUILD_CFLAGS) -c $< -o $@
$(LIB_A)(%.o): %.o $(LIB_A)(%.o): %.o
$(AR) cr $(LIB_A) $< $(AR) crU $(LIB_A) $<
timers_%.h: %.h $(GENERATE_FUNC_TIMERS) timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
sh $(GENERATE_FUNC_TIMERS) $< $@ sh $(GENERATE_FUNC_TIMERS) $< $@

8
make/swig.mk
View file

@ -9,8 +9,8 @@ ifeq ($(SWIG_TARGET),php)
SWIG_OPTS ?= -$(PHP) SWIG_OPTS ?= -$(PHP)
SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP) SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP)
SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) #SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP)
SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend #SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend
SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini
SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d
#SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE) #SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE)
@ -22,7 +22,7 @@ ifeq ($(SWIG_TARGET),php)
endif endif
SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI) SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI)
INCLUDE += $(addprefix -I$(SWIG_PHP_INCLUDE_DIR)/,$(SWIG_PHP_INCLUDE_SUBDIRS)) INCLUDE += $(shell php-config --includes)
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions
LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function
LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function
@ -60,7 +60,7 @@ else ifeq ($(SWIG_TARGET),python)
SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
INCLUDE += $(shell pkg-config --cflags python) INCLUDE += $(shell pkg-config --cflags python)
BUILD_LDFLAGS += $(shell pkg-config --libs python) BUILD_LDFLAGS += $(shell pkg-config --libs python) $(shell php-config --ldflags --libs)
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)