asterisk-13.x: clean up compile stage

[feed/telephony.git] / net / asterisk-13.x / Makefile

diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index c487c99d0c28f67f3e8463d8d3e3592a5da494e7..ffcea6e6142ade732cacba400adf654a24f6b39b 100644 (file)
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -169,7 +169,7 @@ define Package/asterisk13-sounds/install
        rm -f $(1)/usr/share/asterisk/sounds/vm-*
 endef
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
+ifneq ($(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
   CONFIGURE_ARGS+= \
        --with-dahdi="$(STAGING_DIR)/usr" \
        --with-pri="$(STAGING_DIR)/usr" \
@@ -181,11 +181,9 @@ else
        --without-tonezone
 endif
 
-TARGET_LDFLAGS+= \
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pbx-lua),-ldl -lcrypt)
-
-EXTRA_CFLAGS+=$(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+=$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
+# Pass CPPFLAGS in the CFLAGS as otherwise the build system will
+# ignore them.
+TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
 
 CONFIGURE_ARGS+= \
        --without-execinfo \
@@ -232,6 +230,20 @@ CONFIGURE_ARGS+= \
 CONFIGURE_VARS += \
        ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR)/host/bin/xml2-config
 
+MAKE_FLAGS+= \
+       ASTDATADIR="/usr/share/asterisk" \
+       DESTDIR="$(PKG_INSTALL_DIR)"
+
+# show full gcc arguments instead of [CC] and [LD]
+MAKE_FLAGS+= \
+       NOISY_BUILD="yes"
+
+# don't let asterisk mess with build flags
+MAKE_FLAGS+= \
+       AST_FORTIFY_SOURCE="" \
+       DEBUG="" \
+       OPTIMIZE=""
+
 AST_MENUSELECT_OPTS = \
        --without-newt \
        --without-curses \
@@ -242,7 +254,7 @@ define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                ./bootstrap.sh; \
        );
-       $(call Build/Configure/Default,,$(SITE_VARS))
+       $(call Build/Configure/Default)
        (cd $(PKG_BUILD_DIR)/menuselect; \
                ./bootstrap.sh; \
                ./configure \
@@ -257,19 +269,7 @@ define Build/Compile
        $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \
                CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOST)/include/libxml2" \
                LDFLAGS="$(HOST_LDFLAGS) -lxml2"
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               include/asterisk/version.h \
-               include/asterisk/buildopts.h defaults.h \
-               makeopts.embed_rules
-       ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY"
-       ASTLDFLAGS="$(EXTRA_LDFLAGS)"
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               ASTDATADIR="/usr/share/asterisk" \
-               NOISY_BUILD="yes" \
-               DEBUG="" \
-               OPTIMIZE="" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install samples
+       $(call Build/Compile/Default,all install samples)
 endef
 
 define Build/InstallDev