[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 0ac1cdbb3928d3642382fed7d7392e1519ba9a11..4719cc5250bd879fdc05b6608a0176fefdcc7aea 100644 (file)
--- a/libs/axtls/Makefile
+++ b/libs/axtls/Makefile
@@ -1,28 +1,28 @@
 # 
 # 

-# 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.
 #
 #
 # 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
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=axtls

-PKG_VERSION:=1.1.6
+PKG_VERSION:=1.2.2

 PKG_RELEASE:=1
 
 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz
 PKG_RELEASE:=1
 
 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=@SF/axtls http://www.leroc.com.au/axTLS/
-PKG_MD5SUM:=50e63d5fe002399e2ae63591908f7f5a
+PKG_SOURCE_URL:=@SF/axtls
+PKG_MD5SUM:=03471b5a5874e2ce86025f24b3fa0958

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/axTLS
+TAR_OPTIONS:=--transform='s,axTLS,$(PKG_NAME)-$(PKG_VERSION),' -xvf -

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaxtls
   SECTION:=libs
   CATEGORY:=Libraries
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaxtls
   SECTION:=libs
   CATEGORY:=Libraries

+  SUBMENU:=ssl

   TITLE:=Embedded client/server TLSv1 SSL library
   URL:=http://sourceforge.net/projects/axtls
 endef
   TITLE:=Embedded client/server TLSv1 SSL library
   URL:=http://sourceforge.net/projects/axtls
 endef


@@ -30,6 +30,7 @@ endef
 define Package/axhttpd
   SECTION:=net
   CATEGORY:=Network
 define Package/axhttpd
   SECTION:=net
   CATEGORY:=Network

+  SUBMENU:=Web

   DEPENDS:=+libaxtls
   TITLE:=A small embedded web server using the axTLS library
   URL:=http://www.axtls.co.nr/
   DEPENDS:=+libaxtls
   TITLE:=A small embedded web server using the axTLS library
   URL:=http://www.axtls.co.nr/


@@ -40,6 +41,8 @@ define Build/Configure
        $(MAKE) -C $(PKG_BUILD_DIR) oldconfig
 endef
 
        $(MAKE) -C $(PKG_BUILD_DIR) oldconfig
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \


@@ -52,21 +55,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(1)/usr/include/

 
 

-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/axTLS \
-               $(STAGING_DIR)/usr/lib/libaxtls.{a,so*}
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(1)/usr/lib/

 endef
 
 define Package/libaxtls/install
        $(INSTALL_DIR) $(1)/usr/lib
 endef
 
 define Package/libaxtls/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.so.* $(1)/usr/lib/

 endef
 
 define Package/axhttpd/install
 endef
 
 define Package/axhttpd/install