[package] clean up the tar options when extracting axtls (#5212)

[openwrt/svn-archive/archive.git] / libs / axtls / Makefile

diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile
index 20e7f1cffe89a5a0a9c8a5defc607b05b8400b83..4719cc5250bd879fdc05b6608a0176fefdcc7aea 100644 (file)
--- a/libs/axtls/Makefile
+++ b/libs/axtls/Makefile
@@ -1,40 +1,38 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=axtls
-PKG_VERSION:=1.01
+PKG_VERSION:=1.2.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/axTLS
 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/axtls http://www.leroc.com.au/axTLS/
-PKG_MD5SUM:=ff71cb64234cad020f92bffa534ab2b8
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=@SF/axtls
+PKG_MD5SUM:=03471b5a5874e2ce86025f24b3fa0958
+
+TAR_OPTIONS:=--transform='s,axTLS,$(PKG_NAME)-$(PKG_VERSION),' -xvf -
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaxtls
   SECTION:=libs
   CATEGORY:=Libraries
+  SUBMENU:=ssl
   TITLE:=Embedded client/server TLSv1 SSL library
-  DEPENDS:=libgdbm
-  DESCRIPTION:=Embedded client/server TLSv1 SSL library.
   URL:=http://sourceforge.net/projects/axtls
 endef
 
-define Package/awhttpd
+define Package/axhttpd
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Web
   DEPENDS:=+libaxtls
-  TITLE:=Anti-Web webserver
-  DESCRIPTION:=Anti-Web webserver.
+  TITLE:=A small embedded web server using the axTLS library
   URL:=http://www.axtls.co.nr/
 endef
 
@@ -43,21 +41,36 @@ define Build/Configure
        $(MAKE) -C $(PKG_BUILD_DIR) oldconfig
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
-               OPT_CFLAGS="$(TARGET_CFLAGS)" OPT_LDFLAGS=""
+               STRIP="/bin/true" \
+               OPT_CFLAGS="$(TARGET_CFLAGS)" OPT_LDFLAGS="" \
+               all
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               PREFIX="$(PKG_INSTALL_DIR)/usr" \
+               install
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libaxtls/install
-       install -d -m0755 $(1)/usr/lib
-       install -m0755 $(PKG_BUILD_DIR)/libaxtls.so $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.so.* $(1)/usr/lib/
 endef
 
-define Package/awhttpd/install
-       install -d -m0755 $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/awhttpd $(1)/usr/sbin/
+define Package/axhttpd/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/axhttpd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,libaxtls))
-$(eval $(call BuildPackage,awhttpd))
+$(eval $(call BuildPackage,axhttpd))