X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibsndfile%2FMakefile;h=2914b298d8fae69120fed8a3c95b9cddf7d1f868;hp=71f2fb1de803bc1c7fdf083ebb2c9ea74f19f5b2;hb=b5ddb36bd394091c6146e569a1c975dd9ed133ef;hpb=d85961b5ffc35f9b5e8caa42da83613da118fec5

diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile
index 71f2fb1de8..2914b298d8 100644
--- a/libs/libsndfile/Makefile
+++ b/libs/libsndfile/Makefile
@@ -1,24 +1,21 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 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:=libsndfile
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.0.20
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.mega-nerd.com/libsndfile/
-PKG_MD5SUM:=2d126c35448503f6dbe33934d9581f6b
-PKG_CAT:=zcat
+PKG_MD5SUM:=e0553e12c7a467af44693e95e2eac668
 
-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
 
@@ -26,40 +23,36 @@ define Package/libsndfile
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Library for reading/writing audio files
+  DEPENDS:=@!avr32
   URL:=http://www.mega-nerd.com/libsndfile/
 endef
 
 define Package/libsndfile/description
-	libsndfile is a library of C routines for reading and writing files 
-	containing sampled audio data.
+ libsndfile is a library of C routines for reading and writing files 
+ containing sampled audio data.
 endef
 
-CONFIGURE_ARGS += \
-	--disable-flac
-
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install
+TARGET_CFLAGS += $(FPIC)
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sndfile.pc $(1)/usr/lib/pkgconfig/
+CONFIGURE_ARGS += \
+	--disable-alsa \
+	--disable-external-libs \
+	--disable-sqlite \
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/sndfile* \
-		$(STAGING_DIR)/usr/lib/libsndfile.{a,so*,la} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/sndfile.pc
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
 define Package/libsndfile/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.so* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libsndfile))