Add libtool fixup to taglib.

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

diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile
index 8b1fc5d3900a62a09ce93098f1773aecca0e2ae9..e98a9a3709430ee938cc1cb1320673aa62f6c629 100644 (file)
--- a/libs/ustl/Makefile
+++ b/libs/ustl/Makefile
@@ -16,9 +16,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2
 PKG_SOURCE_URL:=@SF/ustl
 PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0
-PKG_CAT:=bzcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,12 +23,16 @@ define Package/ustl
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C++ STL for embedded systems
-  DESCRIPTION:=C++ Standard Template Library (STL) for embedded systems.\\\
+  DEPENDS:=@!TARGET_avr32
+  URL:=http://ustl.sourceforge.net/
+endef
+
+define Package/ustl/description
+       C++ Standard Template Library (STL) for embedded systems.\\\
     uSTL is a partial implementation of the STL (Standard Template \\\
     Library) that reduces code size by factoring memory management \\\
     code into a non-template base class and deriving containers \\\
     from it.
-  URL:=http://ustl.sourceforge.net/
 endef
 
 define Build/Configure
@@ -39,6 +40,8 @@ define Build/Configure
        $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
@@ -50,21 +53,15 @@ define Build/Compile
 endef
 
 define Package/ustl/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(1)/usr/lib/
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/ustl* \
-               $(STAGING_DIR)/usr/lib/libustl.{a,so*}
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,ustl))