X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Ftaglib%2FMakefile;h=10097fd422a69e08b136b5c193b201155bdf96b6;hp=e9471dcd1d806c91507e101edb11b47bc3cdc478;hb=31746dfb3bbcd2d9658d1f4fe234e6d09bbf4a12;hpb=348b36e31097151e5ee2ba7c437a7af454a17ce0

diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile
index e9471dcd1d..10097fd422 100644
--- a/libs/taglib/Makefile
+++ b/libs/taglib/Makefile
@@ -1,69 +1,68 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 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:=taglib
 PKG_VERSION:=1.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://developer.kde.org/~wheeler/files/src/
 PKG_MD5SUM:=dcd50ddb2544faeae77f194804559404
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/taglib
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+zlib
+  DEPENDS:= +uclibcxx +zlib @!TARGET_avr32
   TITLE:=Audio output library
-  DESCRIPTION:=\
-  	the audio output library
   URL:=http://developer.kde.org/~wheeler/taglib.html
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-final \
-	)
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	$(call Build/Compile/Default,\
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install \
-	)
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--enable-final \
+
+CONFIGURE_VARS += \
+        CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
+        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
+	LDFLAGS="$$$$LDFLAGS" \
+	LIBS="-nodefaultlibs -lz -luClibc++" \
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag* $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/include/taglib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/taglib/* $(STAGING_DIR)/usr/include/taglib/
-endef
+	$(INSTALL_DIR) $(2)/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/taglib-config \
+		$(2)/bin/
+	$(SED) \
+		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+		$(2)/bin/taglib-config
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/bin/taglib-config \
-		$(STAGING_DIR)/usr/lib/libtag* \
-		$(STAGING_DIR)/usr/include/taglib/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libtag.{la,a,so*} \
+		$(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include/taglib
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/taglib/* \
+		$(1)/usr/include/taglib/
 endef
 
 define Package/taglib/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,taglib))