From eb89ad4257bc75eb663fc4550b9cd3cd351b41e8 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Mon, 23 Jul 2007 12:02:35 +0000 Subject: [PATCH] cleanup alsa-lib --- package/alsa-lib/alsa-lib.mk | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 735a80b8ee..3d4e399df9 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -3,10 +3,10 @@ # alsa-lib # ############################################################# -ALSA_LIB_VER:=1.0.14a -ALSA_LIB_SOURCE:=alsa-lib-$(ALSA_LIB_VER).tar.bz2 +ALSA_LIB_VERSION:=1.0.14a +ALSA_LIB_SOURCE:=alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE:=ftp://ftp.alsa-project.org/pub/lib -ALSA_LIB_DIR:=$(BUILD_DIR)/alsa-lib-$(ALSA_LIB_VER) +ALSA_LIB_DIR:=$(BUILD_DIR)/alsa-lib-$(ALSA_LIB_VERSION) ALSA_LIB_CAT:=$(BZCAT) ALSA_LIB_BINARY:=libasound.so.2.0.0 ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY) @@ -16,12 +16,13 @@ $(DL_DIR)/$(ALSA_LIB_SOURCE): $(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE) $(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/alsa-lib/ alsa-lib-$(ALSA_LIB_VER)\*.patch* + toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/alsa-lib/ alsa-lib-$(ALSA_LIB_VERSION)\*.patch* $(CONFIG_UPDATE) $(ALSA_LIB_DIR) - @touch $@ + touch $@ $(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked (cd $(ALSA_LIB_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ @@ -36,25 +37,25 @@ $(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked --disable-docs \ $(DISABLE_NLS) \ ); - @touch $@ + touch $@ $(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY): $(ALSA_LIB_DIR)/.configured $(MAKE) -C $(ALSA_LIB_DIR) - @touch -c $@ + touch -c $@ $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY): $(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_LIB_DIR) install - @touch -c $@ + touch -c $@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY) - @mkdir -p $(TARGET_DIR)/usr/share/alsa - @mkdir -p $(TARGET_DIR)/usr/lib/alsa-lib + mkdir -p $(TARGET_DIR)/usr/share/alsa + mkdir -p $(TARGET_DIR)/usr/lib/alsa-lib cp -dpf $(STAGING_DIR)/lib/libasound.so* $(TARGET_DIR)/usr/lib/ cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/ cp -rdpf $(STAGING_DIR)/usr/lib/alsa-lib/* $(TARGET_DIR)/usr/lib/alsa-lib/ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libasound.so* -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/alsa-lib/*.so - @touch -c $@ + touch -c $@ alsa-lib: linux26 uclibc $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY) -- 2.30.2