make asterisk chan_bluetooth and chan_h323 modules optional,

link openh323 and pwlib statically.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3737 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 47 insertions, 35 deletions

diff --git a/openwrt/package/openh323/Config.in b/openwrt/package/openh323/Config.in
index 1aa3202e9c..6dfe1f97a6 100644
--- a/openwrt/package/openh323/Config.in
+++ b/openwrt/package/openh323/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_OPENH323
-	prompt "openh323.......................... OpenH323 implementation"
+config BR2_COMPILE_OPENH323
+#	prompt "openh323.......................... OpenH323 implementation"
 	tristate
-	select BR2_PACKAGE_PWLIB
+	select BR2_COMPILE_PWLIB
 	default n
 	help
diff --git a/openwrt/package/openh323/Makefile b/openwrt/package/openh323/Makefile
index f9b8a514f9..a17ac00999 100644
--- a/openwrt/package/openh323/Makefile
+++ b/openwrt/package/openh323/Makefile
@@ -12,45 +12,57 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,OPENH323,openh323,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
-	rm -rf $(PKG_INSTALL_DIR);
-	mkdir -p $(PKG_INSTALL_DIR);
-	ln -s $(PKG_BUILD_DIR)/../pwlib-cvs-20051227 $(PKG_BUILD_DIR)/../pwlib; 
-	cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-	PWLIBDIR="$(STAGING_DIR)" \
-	    ./configure \
-	    --prefix=$(STAGING_DIR) \
-	    --target=$(GNU_TARGET_NAME) \
-	    --host=$(GNU_TARGET_NAME) \
-	    --build=$(GNU_HOST_NAME) \
-	cd $(PKG_BUILD_DIR)/plugins; rm -rf config.{cache,status}; \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-	PWLIBDIR="$(STAGING_DIR)" \
-	    ./configure \
-	    --prefix=$(STAGING_DIR)
+	( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti"  \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			  $(DISABLE_LARGEFILE) \
+			  $(DISABLE_NLS) \
+			\
+			--enable-minsize \
+			--enable-audio \
+			--disable-video \
+	);
 	touch $@
 
+
 $(PKG_BUILD_DIR)/.built:
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-	PWLIBDIR="$(PKG_BUILD_DIR)/../pwlib-cvs-20051227/" \
-	$(MAKE) -C $(PKG_BUILD_DIR)/plugins $(TARGET_CONFIGURE_OPTS)
-	
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-	PWLIBDIR="$(PKG_BUILD_DIR)/../pwlib-cvs-20051227/" \
-	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) opt install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		optnoshared
 	touch $@
+
+install-link:
+	ln -s $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME)
+
+uninstall-link:
+	rm -rf $(BUILD_DIR)/$(PKG_NAME)
+
+compile-targets: $(PKG_BUILD_DIR)/.built install-link
+clean-targets: uninstall-link