Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 4 insertions, 61 deletions

diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile
index 0a29d73d0..e7ee317e6 100644
--- a/drivers/sound/Makefile
+++ b/drivers/sound/Makefile
@@ -4,14 +4,6 @@
 # Rewritten to use lists instead of if-statements.
 
 
-
-# My subdirectories.
-
-SUB_DIRS	:= 
-MOD_SUB_DIRS	:=
-MOD_IN_SUB_DIRS	:=
-ALL_SUB_DIRS	:= $(SUB_DIRS) emu10k1
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
@@ -20,17 +12,6 @@ export-objs	:=  ad1848.o audio_syms.o midi_syms.o mpu401.o \
 		    sound_core.o sound_syms.o uart401.o	\
 		    nm256_audio.o ac97.o ac97_codec.o
 
-
-
-# Object file lists.
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_SOUND)		+= soundcore.o
@@ -83,23 +64,16 @@ obj-$(CONFIG_SOUND_CS4281)	+= cs4281.o
 obj-$(CONFIG_SOUND_MAESTRO)	+= maestro.o
 obj-$(CONFIG_SOUND_TRIDENT)	+= trident.o ac97_codec.o
 
+subdir-$(CONFIG_SOUND_EMU10K1) += emu10k1
+
 ifeq ($(CONFIG_SOUND_EMU10K1),y)
-  SUB_DIRS          += emu10k1
   obj-y += emu10k1/emu10k1.o
-else
-  ifeq ($(CONFIG_SOUND_EMU10K1),m)
-     MOD_SUB_DIRS   += emu10k1
-  endif
 endif
 
+subdir-$(CONFIG_DMASOUND) += dmasound
+
 ifeq ($(CONFIG_DMASOUND),y)
-  SUB_DIRS += dmasound
-  MOD_IN_SUB_DIRS += dmasound
   obj-y += dmasound/dmasound.o
-else
-  ifeq ($(CONFIG_DMASOUND),m)
-    MOD_IN_SUB_DIRS += dmasound
-  endif
 endif
 
 
@@ -124,39 +98,8 @@ vidc_mod-objs	:= vidc.o vidc_fill.o
 wavefront-objs  := wavfront.o wf_midi.o yss225.o
 
 
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are the intermediate files used to build the multi's.
-
-multi-y		:= $(filter $(list-multi), $(obj-y))
-multi-m		:= $(filter $(list-multi), $(obj-m))
-int-y		:= $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-
-
-# Files that are both resident and modular: remove from modular.
-
-obj-m		:= $(filter-out $(obj-y), $(obj-m))
-int-m		:= $(filter-out $(int-y), $(int-m))
-
-
-# Take multi-part drivers out of obj-y and put components in.
-
-obj-y		:= $(filter-out $(list-multi), $(obj-y)) $(int-y)
-
-
-
-# Translate to Rules.make lists.
-
 O_TARGET	:= sounddrivers.o
 
-O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
-OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
-M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
-MI_OBJS		:= $(sort $(filter-out $(export-objs), $(int-m)))
-MIX_OBJS	:= $(sort $(filter     $(export-objs), $(int-m)))
-
 include $(TOPDIR)/Rules.make