From 7ffe0c4b8126d074961bb466ab1bb8670ff0a7cc Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 28 Dec 2017 20:07:25 +0000 Subject: [PATCH] rules.mk, swig.mk: Add dependencies for Debian Stretch / Unstable Signed-off-by: Jan Lindemann --- make/rules.mk | 2 +- make/swig.mk | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/make/rules.mk b/make/rules.mk index 92c5f619..b26ceb0f 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -298,7 +298,7 @@ $(FLAVOUR_PREFIX)%.o: %.S $(CC) $(BUILD_CFLAGS) -c $< -o $@ $(LIB_A)(%.o): %.o - $(AR) cr $(LIB_A) $< + $(AR) crU $(LIB_A) $< timers_%.h: %.h $(GENERATE_FUNC_TIMERS) sh $(GENERATE_FUNC_TIMERS) $< $@ diff --git a/make/swig.mk b/make/swig.mk index e0305e01..fe8ead91 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -9,8 +9,8 @@ ifeq ($(SWIG_TARGET),php) SWIG_OPTS ?= -$(PHP) SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP) - SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) - SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend + #SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) + #SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d #SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE) @@ -22,7 +22,7 @@ ifeq ($(SWIG_TARGET),php) endif 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 LOCAL_CFLAGS += -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) 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)