aboutsummaryrefslogtreecommitdiff
path: root/package/libsndfile
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-06-23 09:50:29 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-06-23 09:50:29 +0000
commit43201cc258884f26024708d028cf5b3250bcd903 (patch)
tree73096254033e89e5fb0adafbb01870592dd8349e /package/libsndfile
parentaec891b737e5d4fabfdc8e1cd49230b365575ae6 (diff)
downloadbuildroot-43201cc258884f26024708d028cf5b3250bcd903.tar.gz
buildroot-43201cc258884f26024708d028cf5b3250bcd903.tar.bz2
- Fixed a type in the binary target and also install to staging_dir (Julien Letessier)
- make sure that -clean also wipes the staging_dir files.
Diffstat (limited to 'package/libsndfile')
-rw-r--r--package/libsndfile/libsndfile.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk
index 1a451414da..694705feae 100644
--- a/package/libsndfile/libsndfile.mk
+++ b/package/libsndfile/libsndfile.mk
@@ -7,18 +7,19 @@ LIBSNDFILE_VER:=1.0.17
LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VER).tar.gz
LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile/$(LIBUSB_SOURCE)
LIBSNDFILE_DIR:=$(BUILD_DIR)/libsndfile-$(LIBSNDFILE_VER)
-LIBSNDFILE_BINARY:=libsndfile.sa
+LIBSNDFILE_BINARY:=src/.libs/libsndfile.so
LIBSNDFILE_TARGET_BINARY:=usr/lib/libsndfile.so
$(DL_DIR)/$(LIBSNDFILE_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBSNDFILE_SITE)/$(LIBSNDFILE_SOURCE)
-$(LIBSNDFILE_DIR)/.source: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
+$(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
$(ZCAT) $(DL_DIR)/$(LIBSNDFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBSNDFILE_DIR) package/libsndfile/ \*.patch
- touch $(LIBSNDFILE_DIR)/.source
+ $(CONFIG_UPDATE) $(LIBSNDFILE_DIR)
+ touch $@
-$(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.source
+$(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.unpacked
(cd $(LIBSNDFILE_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -29,13 +30,14 @@ $(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.source
--prefix=/usr \
--sysconfdir=/etc \
);
- touch $(LIBSNDFILE_DIR)/.configured;
+ touch $@
$(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY): $(LIBSNDFILE_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(LIBSNDFILE_DIR)
$(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY): $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY)
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) install
+ $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) install
rm -Rf $(TARGET_DIR)/usr/man
libsndfile: uclibc $(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY)
@@ -44,12 +46,12 @@ libsndfile-source: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
libsndfile-clean:
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
+ -$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
-$(MAKE) -C $(LIBSNDFILE_DIR) clean
libsndfile-dirclean:
rm -rf $(LIBSNDFILE_DIR)
-
#############################################################
#
# Toplevel Makefile options