summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-02-01 19:37:14 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-02-01 19:37:14 +0000
commita1523adcad775d5d881e64945a3e9d66012739ba (patch)
treef8259372ad1cb0760e2f63862145a60dd306a5ec
parent91f780bc056df2a5263aa5c89323932265d95751 (diff)
alsa-lib: clean up makefile
As discussed on the list. I suspect the ARM abi thing isn't needed anymore now we use the correct abi in the first place, but I'll leave it in until after the release.
-rw-r--r--package/multimedia/alsa-lib/alsa-lib.mk12
1 files changed, 5 insertions, 7 deletions
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index be6b047c5..9f550b476 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -11,16 +11,14 @@ ALSA_LIB_CAT:=$(BZCAT)
ALSA_LIB_BINARY:=libasound.so.2.0.0
ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
+ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
+
ifeq ($(BR2_arm),y)
-ALSA_LIB_ABI+=-mabi=aapcs-linux
-else
-ALSA_LIB_ABI+=
+ALSA_LIB_CFLAGS+=-mabi=aapcs-linux
endif
ifeq ($(BR2_avr32),y)
-ALSA_LIB_ABI+=-DAVR32_INLINE_BUG
-else
-ALSA_LIB_ABI+=
+ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
@@ -47,7 +45,7 @@ $(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) $(ALSA_LIB_ABI)" \
+ CFLAGS="$(ALSA_LIB_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) -lm" \
./configure \
--target=$(GNU_TARGET_NAME) \