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.
This commit is contained in:
Peter Korsgaard 2009-02-01 19:37:14 +00:00
parent 91f780bc05
commit a1523adcad

View File

@ -11,16 +11,14 @@ ALSA_LIB_CAT:=$(BZCAT)
ALSA_LIB_BINARY:=libasound.so.2.0.0 ALSA_LIB_BINARY:=libasound.so.2.0.0
ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY) ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
ifeq ($(BR2_arm),y) ifeq ($(BR2_arm),y)
ALSA_LIB_ABI+=-mabi=aapcs-linux ALSA_LIB_CFLAGS+=-mabi=aapcs-linux
else
ALSA_LIB_ABI+=
endif endif
ifeq ($(BR2_avr32),y) ifeq ($(BR2_avr32),y)
ALSA_LIB_ABI+=-DAVR32_INLINE_BUG ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
else
ALSA_LIB_ABI+=
endif endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) 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; \ (cd $(ALSA_LIB_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(ALSA_LIB_ABI)" \ CFLAGS="$(ALSA_LIB_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) -lm" \ LDFLAGS="$(TARGET_LDFLAGS) -lm" \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \