ALSA Makefile cleanup: Link subdirs from direct parent

Group decision whether to build objects in subdirectories and whether to
link them together in the direct parent Makefile.

diff --git a/sound/Makefile b/sound/Makefile
index 6693fb33f245f5cef38eda59e6fc580441c24378..a8d579aa0fc2046b526b99ccd7821563717d9cd6 100644 (file)
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -17,32 +17,12 @@ endif
 subdir-$(CONFIG_SND) += core i2c drivers isa pci ppc arm synth
 ifeq ($(CONFIG_SND),y)
   obj-y += core/core.o i2c/_i2c.o
-  obj-y += drivers/drivers.o \
-          drivers/mpu401/_mpu401.o \
-          drivers/opl3/_opl3.o
-  obj-y += isa/isa.o \
-          isa/ad1816a/_ad1816a.o \
-           isa/ad1848/_ad1848.o \
-          isa/cs423x/_cs423x.o \
-          isa/es1688/_es1688.o \
-          isa/gus/_gus.o \
-          isa/opti9xx/_opti9xx.o \
-          isa/sb/_sb.o \
-          isa/wavefront/_wavefront.o
-  obj-y += pci/pci.o \
-          pci/ac97/_ac97.o \
-          pci/ali5451/_ali5451.o \
-          pci/cs46xx/_cs46xx.o \
-          pci/emu10k1/_emu10k1.o \
-          pci/korg1212/_korg1212.o \
-          pci/nm256/_nm256.o \
-          pci/rme9652/_rme9652.o \
-          pci/trident/_trident.o \
-          pci/ymfpci/_ymfpci.o
-  obj-y += ppc/ppc.o
+  obj-y += drivers/drivers.o
+  obj-y += isa/isa.o
+  obj-y += pci/pci.o
   obj-y += arm/arm.o
-  obj-y += synth/synth.o \
-          synth/emux/_emux.o
+  obj-y += ppc/ppc.o
+  obj-y += synth/synth.o
   obj-y += last.o
 endif
 

diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile
index 580f59f7b61f873fb596c68cc44d78beb7f4e21d..a2e79e1ef2df17ef374544ce77fcf8df5d6768c4 100644 (file)
--- a/sound/drivers/Makefile
+++ b/sound/drivers/Makefile
@@ -7,8 +7,6 @@ O_TARGET     := drivers.o
 
 mod-subdirs  := opl3 mpu401
 
-subdir-y     := opl3 mpu401
-
 snd-dummy-objs := dummy.o
 snd-mtpav-objs := mtpav.o
 snd-serial-u16550-objs := serial-u16550.o
@@ -20,4 +18,9 @@ obj-$(CONFIG_SND_VIRMIDI) += snd-virmidi.o
 obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o
 obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
 
+subdir-$(CONFIG_SND) += opl3 mpu401
+ifeq ($(CONFIG_SND),y)
+  obj-y += mpu401/_mpu401.o opl3/_opl3.o
+endif
+
 include $(TOPDIR)/Rules.make

diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index 761e094da4d0eb06fc6266890d2c7dc98734da5b..5af30e7009381479011826cebcafe712e3986fe2 100644 (file)
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -7,8 +7,6 @@ O_TARGET     := isa.o
 
 mod-subdirs  := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
 
-subdir-y     := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
-
 snd-als100-objs := als100.o
 snd-azt2320-objs := azt2320.o
 snd-cmi8330-objs := cmi8330.o
@@ -26,4 +24,16 @@ obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o
 obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o
 obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
 
+subdir-$(CONFIG_SND) += ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
+ifeq ($(CONFIG_SND),y)
+  obj-y += ad1816a/_ad1816a.o \
+          ad1848/_ad1848.o \
+          cs423x/_cs423x.o \
+          es1688/_es1688.o \
+          gus/_gus.o \
+          opti9xx/_opti9xx.o \
+          sb/_sb.o \
+          wavefront/_wavefront.o
+endif
+
 include $(TOPDIR)/Rules.make

diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index 3571eb891dcb1874e28f4862497e99d923eaba72..a5fd4d7baa8eb36cc445f6e7185868269387aed8 100644 (file)
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -7,8 +7,6 @@ O_TARGET     := pci.o
 
 mod-subdirs  := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
 
-subdir-y     := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
-
 snd-als4000-objs := als4000.o
 snd-cmipci-objs := cmipci.o
 snd-cs4281-objs := cs4281.o
@@ -44,4 +42,17 @@ obj-$(CONFIG_SND_SONICVIBES) += snd-sonicvibes.o
 obj-$(CONFIG_SND_VIA686) += snd-via686.o
 obj-$(CONFIG_SND_VIA8233) += snd-via8233.o
 
+subdir-$(CONFIG_SND) += ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
+ifeq ($(CONFIG_SND),y)
+  obj-y += ac97/_ac97.o \
+          ali5451/_ali5451.o \
+          cs46xx/_cs46xx.o \
+          emu10k1/_emu10k1.o \
+          korg1212/_korg1212.o \
+          nm256/_nm256.o \
+          rme9652/_rme9652.o \
+          trident/_trident.o \
+          ymfpci/_ymfpci.o
+endif
+
 include $(TOPDIR)/Rules.make

diff --git a/sound/synth/Makefile b/sound/synth/Makefile
index 22818d53912accffba67905d418035f94fb34b17..f32791b76ef46b02b74cc704a7f4fcc37d22f0cb 100644 (file)
--- a/sound/synth/Makefile
+++ b/sound/synth/Makefile
@@ -7,8 +7,6 @@ O_TARGET     := synth.o
 
 mod-subdirs  := emux
 
-subdir-y     := emux
-
 export-objs  := util_mem.o
 
 snd-util-mem-objs := util_mem.o
@@ -20,4 +18,9 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
   obj-$(CONFIG_SND_SBAWE) += snd-util-mem.o
 endif
 
+subdir-$(CONFIG_SND) += emux
+ifeq ($(CONFIG_SND),y)
+  obj-y += emux/_emux.o
+endif
+
 include $(TOPDIR)/Rules.make