diff options
| -rw-r--r-- | net/Makefile | 4 | ||||
| -rw-r--r-- | net/ethernet/Makefile | 11 | ||||
| -rw-r--r-- | sound/pci/Makefile | 13 | ||||
| -rw-r--r-- | sound/pci/ac97/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/ali5451/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/cs46xx/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/emu10k1/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/korg1212/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/nm256/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/rme9652/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/trident/Makefile | 2 | ||||
| -rw-r--r-- | sound/pci/ymfpci/Makefile | 2 |
12 files changed, 7 insertions, 39 deletions
diff --git a/net/Makefile b/net/Makefile index 7e277835f9fd..f8ed1ac9386d 100644 --- 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 33d2c966f876..671e701d674c 100644 --- 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 fb2346ac4906..5a1598c92fa5 100644 --- 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 869dbf17d057..552b2164bab2 100644 --- 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 ee2672defad5..3ab856b20812 100644 --- 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 8dbafbdde2f1..ffe03b3c1b4d 100644 --- 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 c8fdba031c10..aede6c3be747 100644 --- 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 3b3970119d99..ac68b1a3100c 100644 --- 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 117e421072b1..d6653e669283 100644 --- 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 af34d8ef4fc2..7b093db79323 100644 --- 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 ed8ae57c9f61..41041b2588d4 100644 --- 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 de3410baac7e..2f584df33ad8 100644 --- 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 |