X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fid3lib%2FMakefile;h=28662d8d82a96e11761685cf5409f790f7033a10;hb=06371c5c30fe37512f656a4950b4c92ae074bc8b;hp=fe6bc2617f93480d76136f3ad87b771fbe75a53f;hpb=584069bd18de6bb79e22fccb118d63d4317cf53a;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile
index fe6bc2617f..28662d8d82 100644
--- a/libs/id3lib/Makefile
+++ b/libs/id3lib/Makefile
@@ -1,10 +1,9 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -16,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/id3lib
 PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
 
+PKG_FIXUP:=libtool-ucxx
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/id3lib
@@ -26,39 +28,23 @@ define Package/id3lib
   URL:=http://www.id3lib.org/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
 	--enable-shared \
-	--enable-static \
+	--disable-static
 
-CONFIGURE_VARS += \
+#CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti"  \
 	LIBS="-nodefaultlibs -lz -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.{a,so} $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/id3 \
-		$(STAGING_DIR)/usr/include/id3.h \
-		$(STAGING_DIR)/usr/lib/libid3.{a,so} \
-		$(STAGING_DIR)/usr/lib/libid3-*.so.*
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.{a,so} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/
 endef
 
 define Package/id3lib/install