From b2ad5f821b1381492d792ca10b1eb7a107b48f14 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 17:17:53 +0000 Subject: Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your Makefiles. --- drivers/sound/emu10k1/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'drivers/sound/emu10k1') diff --git a/drivers/sound/emu10k1/Makefile b/drivers/sound/emu10k1/Makefile index 0ae315140..17945f53b 100644 --- a/drivers/sound/emu10k1/Makefile +++ b/drivers/sound/emu10k1/Makefile @@ -2,20 +2,12 @@ # # 12 Apr 2000 Rui Sousa -ifeq ($(CONFIG_SOUND_EMU10K1),y) - O_TARGET := emu10k1.o - O_OBJS = audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \ - emuadxmg.o hwaccess.o irqmgr.o main.o midi.o mixer.o \ - recmgr.o timer.o voicemgr.o -else - ifeq ($(CONFIG_SOUND_EMU10K1),m) - M_OBJS := emu10k1.o - O_TARGET := emu10k1.o - O_OBJS = audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \ +O_TARGET := emu10k1.o + +obj-y := audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \ emuadxmg.o hwaccess.o irqmgr.o main.o midi.o mixer.o \ recmgr.o timer.o voicemgr.o - endif -endif +obj-m := $(O_TARGET) ifdef DEBUG EXTRA_CFLAGS += -DEMU10K1_DEBUG -- cgit v1.2.3