packages/scpa5xx-view: use lowercase config option, use new service functions

[openwrt/svn-archive/archive.git] / net / openser / Makefile

diff --git a/net/openser/Makefile b/net/openser/Makefile
index b74233743bf9efd661c25d2ecd585f829f6b6419..a75e2013c0daa1376c2dd6d2593b7520d15eaa5a 100644 (file)
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -18,14 +17,12 @@ PKG_VARIANT:=
 PKG_SOURCE_URL:=http://openser.org/pub/openser/$(PKG_VERSION)/src
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openser
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Telephony
   TITLE:=Configurable, free SIP server
   URL:=http://www.openser.org
   MENU:=1
@@ -40,7 +37,7 @@ define Package/openser-mod-acc
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Accounting support
-  MENU:=0
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-auth
@@ -48,6 +45,7 @@ define Package/openser-mod-auth
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Authentication support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-auth-db
@@ -55,6 +53,7 @@ define Package/openser-mod-auth-db
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Authentication with database support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-auth-radius
@@ -62,6 +61,7 @@ define Package/openser-mod-auth-radius
   CATEGORY:=Network
   DEPENDS:=openser +libradiusclient-ng
   TITLE:=Authentication with RADIUS support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-avp-radius
@@ -69,6 +69,7 @@ define Package/openser-mod-avp-radius
   CATEGORY:=Network
   DEPENDS:=openser +libradiusclient-ng
   TITLE:=AVP with RADIUS support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-avpops
@@ -76,6 +77,7 @@ define Package/openser-mod-avpops
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=AVP options support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-dispatcher
@@ -83,6 +85,7 @@ define Package/openser-mod-dispatcher
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Dispatcher support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-diversion
@@ -90,6 +93,7 @@ define Package/openser-mod-diversion
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Diversion support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-flatstore
@@ -97,6 +101,7 @@ define Package/openser-mod-flatstore
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Flatstore support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-gflags
@@ -104,6 +109,7 @@ define Package/openser-mod-gflags
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Gflags support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-group
@@ -111,6 +117,7 @@ define Package/openser-mod-group
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Group support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-group-radius
@@ -118,6 +125,7 @@ define Package/openser-mod-group-radius
   CATEGORY:=Network
   DEPENDS:=openser +libradiusclient-ng
   TITLE:=Group with RADIUS support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-lcr
@@ -125,6 +133,7 @@ define Package/openser-mod-lcr
   CATEGORY:=Network
   DEPENDS:=openser openser-mod-mysql
   TITLE:=Least Cost Routing support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-mediaproxy
@@ -132,6 +141,7 @@ define Package/openser-mod-mediaproxy
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Mediaproxy support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-msilo
@@ -139,6 +149,7 @@ define Package/openser-mod-msilo
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=MSilo support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-mysql
@@ -146,6 +157,7 @@ define Package/openser-mod-mysql
   CATEGORY:=Network
   DEPENDS:=openser +libmysqlclient
   TITLE:=MySQL support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-nathelper
@@ -153,6 +165,7 @@ define Package/openser-mod-nathelper
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=NAT helper support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-options
@@ -160,6 +173,7 @@ define Package/openser-mod-options
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Options support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-pdt
@@ -167,6 +181,7 @@ define Package/openser-mod-pdt
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=PDT support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-permissions
@@ -174,6 +189,7 @@ define Package/openser-mod-permissions
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Permissions support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-pike
@@ -181,6 +197,7 @@ define Package/openser-mod-pike
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=PIKE support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-sms
@@ -188,6 +205,7 @@ define Package/openser-mod-sms
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=SMS support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-speeddial
@@ -195,6 +213,7 @@ define Package/openser-mod-speeddial
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Speeddial supporte
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-uac
@@ -202,6 +221,7 @@ define Package/openser-mod-uac
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=UAC support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-uac-redirect
@@ -209,6 +229,7 @@ define Package/openser-mod-uac-redirect
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=UAC with redirect support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-uri
@@ -216,6 +237,7 @@ define Package/openser-mod-uri
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=URI support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-uri-db
@@ -223,6 +245,7 @@ define Package/openser-mod-uri-db
   CATEGORY:=Network
   DEPENDS:=openser +openser-mod-mysql
   TITLE:=URI with database support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-uri-radius
@@ -230,6 +253,7 @@ define Package/openser-mod-uri-radius
   CATEGORY:=Network
   DEPENDS:=openser +libradiusclient-ng
   TITLE:=URI with RADIUS support
+  SUBMENU:=Telephony
 endef
 
 define Package/openser-mod-xlog
@@ -237,6 +261,7 @@ define Package/openser-mod-xlog
   CATEGORY:=Network
   DEPENDS:=openser
   TITLE:=Advanced logging support
+  SUBMENU:=Telephony
 endef
 
 # Select here the modules for the ipk package
@@ -251,24 +276,24 @@ define Build/Compile
                extra_defs="-DUSE_PTHREAD_MUTEX "  \
                CC="$(TARGET_CC)" \
                ARCH="$(ARCH)"  \
-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
                LOCALBASE="$(STAGING_DIR)/usr" \
                all utils/gen_ha1/gen_ha1
 endef
 
 define Package/openser/install 
-       mkdir -p $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
        $(CP) $(PKG_BUILD_DIR)/utils/gen_ha1/gen_ha1 $(1)/usr/sbin/openser_gen_ha1
        $(CP) $(PKG_BUILD_DIR)/scripts/sc $(1)/usr/sbin/openserctl
        chmod 744 $(1)/usr/sbin/openserctl
        $(CP) $(PKG_BUILD_DIR)/scripts/sc.dbtext $(1)/usr/sbin/dbtextctl
        chmod 744 $(1)/usr/sbin/dbtextctl
-       mkdir -p $(1)/usr/lib/openser/modules
+       $(INSTALL_DIR) $(1)/usr/lib/openser/modules
        (cd $(PKG_BUILD_DIR);\
                $(CP) $(OPENSER_MODULE_FILES) $(1)/usr/lib/openser/modules/; \
        )
-       mkdir -p $(1)/etc/openser
+       $(INSTALL_DIR) $(1)/etc/openser
        $(CP) $(PKG_BUILD_DIR)/etc/openser.cfg $(1)/etc/openser/
 endef