X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=sound%2Flame%2FMakefile;h=aa5302a86745927d0aaa7f218490e636aac730d0;hp=3786af0ac34ad8b0cac6f48c65fcde638d3cfa32;hb=c0b14e29ecf3f24be5f15ce9bc58d932471e08e9;hpb=5fc3776a1797249321f46ec629cec32d62a15272

diff --git a/sound/lame/Makefile b/sound/lame/Makefile
index 3786af0ac3..aa5302a867 100644
--- a/sound/lame/Makefile
+++ b/sound/lame/Makefile
@@ -1,5 +1,5 @@
 #
-# 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.
@@ -9,14 +9,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lame
-PKG_VERSION:=3.97
-PKG_RELEASE:=1
+PKG_VERSION:=398-2
+PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lame
-PKG_MD5SUM:=90a4acbb730d150dfe80de145126eef7
+PKG_MD5SUM:=719dae0ee675d0c16e0e89952930ed35
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/lame/Default
   SECTION:=sound
   CATEGORY:=Sound
@@ -43,31 +46,32 @@ define Package/lame-lib/description
 lame mp3 encoder libs
 endef
 
-
 define Build/Configure
-	$(call Build/Configure/Default) 
+	$(call Build/Configure/Default, \
+	--disable-nasm \
+	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
 
-define Package/lame/install	
+define Package/lame/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lame $(1)/usr/bin/
 endef
 
-define Package/lame-lib/install	
+define Package/lame-lib/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/{lib,include}
-	${CP} $(PKG_INSTALL_DIR)/usr/{lib,include} $(1)/usr/
- 
+	$(INSTALL_DIR) $(1)/usr/include/lame
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/lame/*.h \
+		$(1)/usr/include/lame/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,lame-lib))