asterisk-1.8.x-mod: Makefile: Added place holders for more easy configuring of make options DEBUG and OPTIMIZE

voice-client: No longer depends on asterisk18-mod (avoids circular dependancy)

asterisk-1.8.x-mod/Makefile

@@ -42,6 +42,9 @@ $(call Package/asterisk18-mod/Default)
   TITLE:=Complete open source PBX, v1.8x
   MENU:=1
   DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+ifeq ($(CONFIG_PACKAGE_voice-client),y)
+  DEPENDS+= +voice-client
+endif
 endef
 
 define Package/asterisk18-mod/description
@@ -395,7 +398,35 @@ CONFIGURE_ARGS+= \
 EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
 EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
 
+ifeq ($(CONFIG_DEBUG),y)
+	CONFIGURE_ARGS+= \
+		--enable-dev-mode
+	MENUSELECT_ARGS+= \
+		--enable BETTER_BACKTRACES
+	MENUSELECT_ARGS+= \
+		--enable DEBUG_THREADS
+	MENUSELECT_ARGS+= \
+		--enable DONT_OPTIMIZE
+	MENUSELECT_ARGS+= \
+		--enable MALLOC_DEBUG
+	#MENUSELECT_ARGS+= \
+	#	--disable LOADABLE_MODULES
+	#MENUSELECT_ARGS+= \
+	#	--enable LOW_MEMORY
+	#MENUSELECT_ARGS+= \
+	#	--enable STATIC_BUILD
 
+	DEBUG:=
+	OPTIMIZE:=
+
+	#CONFIGURE_ARGS+= \
+	#	--enable-coverage
+else
+	MENUSELECT_ARGS+= \
+		--enable LOW_MEMORY
+	DEBUG:=
+	OPTIMIZE:=
+endif
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
@@ -407,6 +438,10 @@ endef
 define Build/Configure
 	-rm $(PKG_BUILD_DIR)/menuselect.makeopts
 	$(call Build/Configure/Default,,$(SITE_VARS))
+	if test -n "$(MENUSELECT_ARGS)" ; then \
+		$(MAKE) -C "$(PKG_BUILD_DIR)" menuselect.makeopts ; \
+		(cd $(PKG_BUILD_DIR) && ./menuselect/menuselect $(MENUSELECT_ARGS)) ; \
+	fi
 endef
 
 define Build/Compile
@@ -414,7 +449,7 @@ define Build/Compile
 		include/asterisk/version.h \
 		include/asterisk/buildopts.h defaults.h \
 		makeopts.embed_rules
-	ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" \
+	ASTCFLAGS="$(EXTRA_CFLAGS)" \
 	ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		ASTVARLIBDIR="/usr/lib/asterisk" \
@@ -422,8 +457,8 @@ define Build/Compile
 		ASTKEYDIR="/usr/lib/asterisk" \
 		ASTDBDIR="/usr/lib/asterisk" \
 		NOISY_BUILD="1" \
-		DEBUG="" \
-		OPTIMIZE="" \
+		DEBUG="$(DEBUG)" \
+		OPTIMIZE="$(OPTIMIZE)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install samples
 endef
@@ -434,6 +469,7 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod/conffiles
 /etc/asterisk/asterisk.conf
 /etc/asterisk/modules.conf
@@ -448,14 +484,22 @@ define Package/asterisk18-mod/conffiles
 /etc/default/asterisk
 /etc/init.d/asterisk
 endef
+else
+define Package/asterisk18-mod/conffiles
+/etc/default/asterisk
+/etc/init.d/asterisk
+endef
+endif
 
 define Package/asterisk18-mod/install
 	$(INSTALL_DIR) $(1)/etc/asterisk/ssl
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 	for f in asterisk extensions features \
 		indications logger manager modules \
 		sip sip_notify rtp; do \
 		$(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
 	done
+endif
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	for f in app_dial app_echo app_playback app_macro \
 		chan_sip res_rtp_asterisk res_rtp_multicast \
@@ -628,13 +672,17 @@ define Package/asterisk18-mod-chan-skinny/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod-chan-brcm/conffiles
 /etc/asterisk/brcm.conf
 endef
+endif
 
 define Package/asterisk18-mod-chan-brcm/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/
+endif
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/
 endef

voice-client/Makefile

@@ -16,13 +16,55 @@ define Package/voice-client
   SECTION:=net
   CATEGORY:=Network
   TITLE:=voice-client
-  DEPENDS:=+asterisk18-mod
 endef
 
 define Package/voice-client/description
 	voice-client
 endef
 
+define Package/voice-client/conffiles
+/etc/asterisk_templates/asterisk.conf.TEMPLATE
+/etc/asterisk_templates/brcm.conf.TEMPLATE
+/etc/asterisk_templates/brcm_line.TEMPLATE
+/etc/asterisk_templates/cdr.conf.TEMPLATE
+/etc/asterisk_templates/codecs.conf.TEMPLATE
+/etc/asterisk_templates/dnsmgr.conf.TEMPLATE
+/etc/asterisk_templates/extensions.conf.TEMPLATE
+/etc/asterisk_templates/extensions_dialtone.TEMPLATE
+/etc/asterisk_templates/extensions_direct.TEMPLATE
+/etc/asterisk_templates/extensions_extra.conf.TEMPLATE
+/etc/asterisk_templates/extensions_incoming_line.TEMPLATE
+/etc/asterisk_templates/extensions_incoming.TEMPLATE
+/etc/asterisk_templates/extensions_local_line.TEMPLATE
+/etc/asterisk_templates/extensions_local.TEMPLATE
+/etc/asterisk_templates/extensions_macro.conf.TEMPLATE
+/etc/asterisk_templates/extensions_provider.TEMPLATE
+/etc/asterisk_templates/features.conf.TEMPLATE
+/etc/asterisk_templates/indications.conf.TEMPLATE
+/etc/asterisk_templates/logger.conf.TEMPLATE
+/etc/asterisk_templates/manager.conf.TEMPLATE
+/etc/asterisk_templates/meetme.conf.TEMPLATE
+/etc/asterisk_templates/modules.conf.TEMPLATE
+/etc/asterisk_templates/musiconhold.conf.TEMPLATE
+/etc/asterisk_templates/queues.conf.TEMPLATE
+/etc/asterisk_templates/queue.TEMPLATE
+/etc/asterisk_templates/res_stun_monitor.conf.TEMPLATE
+/etc/asterisk_templates/rtp.conf.TEMPLATE
+/etc/asterisk_templates/sip.conf.TEMPLATE
+/etc/asterisk_templates/sip_provider.TEMPLATE
+/etc/asterisk_templates/sip_provider_voicesec.TEMPLATE
+/etc/asterisk_templates/sip_registration.TEMPLATE
+/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
+/etc/asterisk_templates/sip_user.TEMPLATE
+/etc/asterisk_templates/voicemail.conf.TEMPLATE
+/etc/asterisk_templates/voicemail_mailbox.TEMPLATE
+/etc/init.d/voice_client
+/etc/config/voice_client
+/etc/config/voice_codecs
+/etc/uci-defaults/99-voice_client
+/etc/idc_cc.cfg
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./files/* $(PKG_BUILD_DIR)/