From c48beb25ff87790c5e10e0bc57589527c1483ba3 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sat, 23 Sep 2006 13:24:00 +0000 Subject: [PATCH] standardize Makefile, only use includes and optimizations on 2.4 SVN-Revision: 4811 --- openwrt/package/alsa/Makefile | 55 ++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/openwrt/package/alsa/Makefile b/openwrt/package/alsa/Makefile index 887404c0c2..ebfb6f872e 100644 --- a/openwrt/package/alsa/Makefile +++ b/openwrt/package/alsa/Makefile @@ -12,47 +12,48 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=alsa-driver PKG_VERSION:=1.0.11 PKG_RELEASE:=1 -PKG_MD5SUM:=57534e4297cd683371402220e3753885 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ +PKG_MD5SUM:=57534e4297cd683371402220e3753885 PKG_CAT:=bzcat include $(INCLUDE_DIR)/package.mk -ifeq ($(LINUX_KARCH),i386) -KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default -KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time -endif -ifeq ($(LINUX_KARCH),mips) -KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic -KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -endif - define Package/kmod-alsa -SECTION:=drivers -CATEGORY:=Drivers -DEPENDS:=@USB_SUPPORT -TITLE:=Advanced Linux Sound Architecture -DESCRIPTION:=Advanced Linux Sound Architecture -URL:=http://alsa-project.org/ -VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + SECTION:=kernel + CATEGORY:=Kernel drivers + DEPENDS:=@USB_SUPPORT + TITLE:=Advanced Linux Sound Architecture + URL:=http://alsa-project.org/ + VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef +ifeq ($(KERNEL),2.4) + ifeq ($(LINUX_KARCH),i386) + KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default + KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time + endif + ifeq ($(LINUX_KARCH),mips) + KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic + KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap + endif +endif + define Build/Configure (cd $(PKG_BUILD_DIR); \ CFLAGS="$(KERNEL_C_INCS)" \ ./configure \ - --with-build=$(LINUX_DIR) \ - --with-kernel=$(LINUX_DIR) \ - --with-cross=$(KERNEL_CROSS) \ - --with-redhat=no \ - --with-suse=no \ - --with-oss=yes \ - --with-isapnp=no \ - --with-sequencer=no \ - --with-cards=usb-audio \ + --with-build="$(LINUX_DIR)" \ + --with-kernel="$(LINUX_DIR)" \ + --with-cross="$(KERNEL_CROSS)" \ + --with-redhat=no \ + --with-suse=no \ + --with-oss=yes \ + --with-isapnp=no \ + --with-sequencer=no \ + --with-cards=usb-audio \ ); endef -- 2.25.1