From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Fri, 9 Mar 2018 11:57:45 +0000 (+0100)
Subject: asterisk-15.x: update compile stage
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc40ee03e4179e4f79599b55a741c8c3f9df4ac1;p=feed%2Ftelephony.git

asterisk-15.x: update compile stage

- define Build/menuselect for reuse
- call the default Compile define for menuselect-tree

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/asterisk-15.x/Makefile b/net/asterisk-15.x/Makefile
index 3a50ae8..6ba714f 100644
--- a/net/asterisk-15.x/Makefile
+++ b/net/asterisk-15.x/Makefile
@@ -379,6 +379,13 @@ AST_MENUSELECT_OPTS = \
 	--without-curses \
 	--with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
 
+define Build/menuselect
+	CC="$(HOSTCC)" \
+	CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
+	LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
+	$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
+endef
+
 define Build/Configure
 	cd $(PKG_BUILD_DIR); \
 		./bootstrap.sh
@@ -396,11 +403,9 @@ define Build/Configure
 endef
 
 define Build/Compile
-	CC="$(HOSTCC)" \
-	CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
-	LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
-	$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
-	$(MAKE) -C "$(PKG_BUILD_DIR)" menuselect-tree
+	$(call Build/menuselect)
+	$(call Build/Compile/Default,menuselect-tree)
+
 	cd "$(PKG_BUILD_DIR)" && MENUSELECT_ARGS= && \
 		for cat in $(MENUSELECT_CATEGORIES); do \
 			MENUSELECT_ARGS="$$$$MENUSELECT_ARGS --disable-category $$$$cat"; \