kbuild: Fix some issues I missed before

Didn't get the net/ conversion quite right, and apparently overlooked
one subdir in sound/. Now fixed.

diff --git a/net/Makefile b/net/Makefile
index 7e277835f9fd773ce5b904ad20ed1ae63c8a7305..f8ed1ac9386dfb54d7ce769dc0b414ae7994a6a5 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -10,9 +10,9 @@ O_TARGET :=   network.o
 mod-subdirs := ipv4 ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched
 export-objs := netsyms.o
 
-obj-y  := socket.o core/ ethernet/
+obj-y  := socket.o core/
 
-obj-$(CONFIG_NET)              += 802/ sched/ netlink/
+obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/
 obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_NETFILTER)                += ipv4/netfilter/
 obj-$(CONFIG_UNIX)             += unix/

diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile
index 33d2c966f876dc32a16a98f1a8f800a645f234b5..671e701d674cb8a3d8e5c8f7d1a7570c2bcfaf7e 100644 (file)
--- a/net/ethernet/Makefile
+++ b/net/ethernet/Makefile
@@ -2,12 +2,9 @@
 # Makefile for the Linux Ethernet layer.
 #
 
-OBJS-y := eth.o
-
-OBJS-$(CONFIG_SYSCTL)  += sysctl_net_ether.o
-OBJS-$(CONFIG_IPX)     += pe2.o
-OBJS-$(CONFIG_ATALK)   += pe2.o
-
-obj-$(CONFIG_NET)      := $(OBJS-y)
+obj-y                                  += eth.o
+obj-$(CONFIG_SYSCTL)                   += sysctl_net_ether.o
+obj-$(subst m,y,$(CONFIG_IPX))         += pe2.o
+obj-$(subst m,y,$(CONFIG_ATALK))       += pe2.o
 
 include $(TOPDIR)/Rules.make

diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index fb2346ac4906b8e7c7ef065cbcbeff948c303a36..5a1598c92fa5c74b4943fd52add0e126606c5ce6 100644 (file)
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -40,17 +40,6 @@ 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
+obj-$(CONFIG_SND) += ac97/ ali5451/ cs46xx/ emu10k1/ korg1212/ nm256/ rme9652/ trident/ ymfpci/
 
 include $(TOPDIR)/Rules.make

diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index 869dbf17d0572bbe7199adf4d167c5e9d4891f01..552b2164bab281ca6a174b2f35902099dd38a898 100644 (file)
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _ac97.o
-
 export-objs  := ac97_codec.o ak4531_codec.o
 
 snd-ac97-codec-objs := ac97_codec.o

diff --git a/sound/pci/ali5451/Makefile b/sound/pci/ali5451/Makefile
index ee2672defad5274ffb1d59520651dbc65c9eda44..3ab856b208125da1bb685163e49263fd843a68cc 100644 (file)
--- a/sound/pci/ali5451/Makefile
+++ b/sound/pci/ali5451/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _ali5451.o
-
 snd-ali5451-objs := ali5451.o
 
 # Toplevel Module Dependency

diff --git a/sound/pci/cs46xx/Makefile b/sound/pci/cs46xx/Makefile
index 8dbafbdde2f173d013a2da7f9f937fe4b1980d6d..ffe03b3c1b4dbed000e2908fe5682e419e36150b 100644 (file)
--- a/sound/pci/cs46xx/Makefile
+++ b/sound/pci/cs46xx/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _cs46xx.o
-
 snd-cs46xx-objs := cs46xx.o cs46xx_lib.o
 
 # Toplevel Module Dependency

diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile
index c8fdba031c10c1143b1e8e01c9865332b8e12320..aede6c3be747c1badcf0daa3ea87ac4880afbda4 100644 (file)
--- a/sound/pci/emu10k1/Makefile
+++ b/sound/pci/emu10k1/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _emu10k1.o
-
 export-objs  := emu10k1_main.o
 
 snd-emu10k1-objs := emu10k1.o emu10k1_main.o \

diff --git a/sound/pci/korg1212/Makefile b/sound/pci/korg1212/Makefile
index 3b3970119d99f71daabd9eaa62b0de44b6fbdd06..ac68b1a3100c7216814e08de10ef08f3a28daf3e 100644 (file)
--- a/sound/pci/korg1212/Makefile
+++ b/sound/pci/korg1212/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _korg1212.o
-
 snd-korg1212-objs := korg1212.o
 
 # Toplevel Module Dependency

diff --git a/sound/pci/nm256/Makefile b/sound/pci/nm256/Makefile
index 117e421072b1ffd071483cb32222f2a705e14266..d6653e669283e0b6112f19b0dbe1c2fdb1839bee 100644 (file)
--- a/sound/pci/nm256/Makefile
+++ b/sound/pci/nm256/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _nm256.o
-
 snd-nm256-objs := nm256.o
 
 # Toplevel Module Dependency

diff --git a/sound/pci/rme9652/Makefile b/sound/pci/rme9652/Makefile
index af34d8ef4fc228be463be5483c827af5b902969f..7b093db79323628d3927ec1ca938fd671830fae1 100644 (file)
--- a/sound/pci/rme9652/Makefile
+++ b/sound/pci/rme9652/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _rme9652.o
-
 export-objs  := rme9652_mem.o
 
 snd-rme9652-mem-objs := rme9652_mem.o

diff --git a/sound/pci/trident/Makefile b/sound/pci/trident/Makefile
index ed8ae57c9f6133d3ad5ec410d518fba5aed1f335..41041b2588d401f055c5870ae5de2d46863d5126 100644 (file)
--- a/sound/pci/trident/Makefile
+++ b/sound/pci/trident/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _trident.o
-
 export-objs  := trident_main.o
 
 snd-trident-objs := trident.o trident_main.o trident_memory.o

diff --git a/sound/pci/ymfpci/Makefile b/sound/pci/ymfpci/Makefile
index de3410baac7e442ae6d22e01edf901ec6490f63c..2f584df33ad80f98b34b091493881b55269b32ee 100644 (file)
--- a/sound/pci/ymfpci/Makefile
+++ b/sound/pci/ymfpci/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-O_TARGET     := _ymfpci.o
-
 snd-ymfpci-objs := ymfpci.o ymfpci_main.o
 
 # Toplevel Module Dependency