Manual merge

Makefile

@@ -124,10 +124,10 @@ DRIVERS-y += drivers/base/base.o \
 	drivers/misc/misc.o \
 	drivers/net/net.o \
 	drivers/media/media.o
-DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
+DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
 DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
 DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
+DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
 DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
 DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
 DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
@@ -139,16 +139,16 @@ endif
 DRIVERS-$(CONFIG_SOUND) += sound/sound.o
 DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
 DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
+DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
 DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
 DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
 DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
+DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
 DRIVERS-$(CONFIG_VT) += drivers/video/video.o
-DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
-DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
+DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
+DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
 DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
 DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o

Rules.make

@@ -144,14 +144,25 @@ cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
 %.o: %.S dummy
 	$(call if_changed,cmd_as_o_S)
 
-# ---------------------------------------------------------------------------
+# FIXME
 
 %.lst: %.c
 	$(CC) $(c_flags) -g -c -o $*.o $<
 	$(TOPDIR)/scripts/makelst $* $(TOPDIR) $(OBJDUMP)
-#
-#
-#
+
+
+# If a Makefile does define neither O_TARGET nor L_TARGET,
+# use a standard O_TARGET named "built-in.o"
+
+ifndef O_TARGET
+ifndef L_TARGET
+O_TARGET := built-in.o
+endif
+endif
+
+# Build the compiled-in targets
+# ---------------------------------------------------------------------------
+
 all_targets: $(O_TARGET) $(L_TARGET) sub_dirs
 
 # To build objects in subdirs, we need to descend into the directories

arch/alpha/math-emu/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the FPU instruction emulation.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_MATHEMU) += math-emu.o
 
 math-emu-objs	:= math.o qrnnd.o

drivers/acorn/net/Makefile

@@ -3,13 +3,6 @@
 # Makefile for the Acorn ethercard network device drivers
 #
 
-O_TARGET := built-in.o
-
-obj-y	:=
-obj-m	:=
-obj-n	:=
-obj-	:=
-
 obj-$(CONFIG_ARM_ETHERH)	+= etherh.o
 obj-$(CONFIG_ARM_ETHER3)	+= ether3.o
 obj-$(CONFIG_ARM_ETHER1)	+= ether1.o

drivers/acorn/scsi/Makefile

@@ -2,13 +2,6 @@
 # Makefile for drivers/acorn/scsi
 #
 
-O_TARGET	:= acorn-scsi.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 export-objs		:= fas216.o queue.o msgqueue.o
 acornscsi_mod-objs	:= acornscsi.o acornscsi-io.o
 

drivers/acpi/Makefile

@@ -21,35 +21,29 @@ obj-y		:= acpi_ksyms.o
 #
 # ACPI Boot-Time Table Parsing
 #
-ifeq ($(CONFIG_ACPI_BOOT),y)
-  obj-y		+= acpi_tables.o
-endif
+obj-$(CONFIG_ACPI_BOOT)		+= acpi_tables.o
 
 #
 # ACPI Core Subsystem (Interpreter)
 #
-ifeq ($(CONFIG_ACPI_INTERPRETER),y)
-  obj-y		+= acpi_osl.o acpi_utils.o
-  subdir-y	+= dispatcher events executer hardware namespace parser \
-		   resources tables utilities
-  obj-y 	+= $(foreach dir,$(subdir-y),$(dir)/$(dir).o)
-endif
+obj-$(CONFIG_ACPI_INTERPRETER)	+= acpi_osl.o acpi_utils.o \
+				   dispatcher/ events/ executer/ hardware/ \
+				   namespace/ parser/ resources/ tables/ \
+				   utilities/
 
 #
 # ACPI Bus and Device Drivers
 #
-ifeq ($(CONFIG_ACPI_BUS),y)
-  obj-y				+= acpi_bus.o 
-  obj-$(CONFIG_ACPI_AC) 	+= acpi_ac.o
-  obj-$(CONFIG_ACPI_BATTERY)	+= acpi_battery.o
-  obj-$(CONFIG_ACPI_BUTTON)	+= acpi_button.o
-  obj-$(CONFIG_ACPI_EC)		+= acpi_ec.o
-  obj-$(CONFIG_ACPI_FAN)	+= acpi_fan.o
-  obj-$(CONFIG_ACPI_PCI)	+= acpi_pci_root.o acpi_pci_link.o
-  obj-$(CONFIG_ACPI_POWER)	+= acpi_power.o
-  obj-$(CONFIG_ACPI_PROCESSOR)	+= acpi_processor.o
-  obj-$(CONFIG_ACPI_THERMAL)	+= acpi_thermal.o
-  obj-$(CONFIG_ACPI_SYSTEM)	+= acpi_system.o
-endif
+obj-$(CONFIG_ACPI_BUS)		+= acpi_bus.o 
+obj-$(CONFIG_ACPI_AC) 		+= acpi_ac.o
+obj-$(CONFIG_ACPI_BATTERY)	+= acpi_battery.o
+obj-$(CONFIG_ACPI_BUTTON)	+= acpi_button.o
+obj-$(CONFIG_ACPI_EC)		+= acpi_ec.o
+obj-$(CONFIG_ACPI_FAN)		+= acpi_fan.o
+obj-$(CONFIG_ACPI_PCI)		+= acpi_pci_root.o acpi_pci_link.o
+obj-$(CONFIG_ACPI_POWER)	+= acpi_power.o
+obj-$(CONFIG_ACPI_PROCESSOR)	+= acpi_processor.o
+obj-$(CONFIG_ACPI_THERMAL)	+= acpi_thermal.o
+obj-$(CONFIG_ACPI_SYSTEM)	+= acpi_system.o
 
 include $(TOPDIR)/Rules.make

drivers/acpi/debugger/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/dispatcher/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/events/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/executer/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/hardware/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/namespace/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/parser/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/resources/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/tables/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/utilities/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/block/paride/Makefile

@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-L_TARGET := paride.a
-
 export-objs := paride.o bpck6.o
 
 obj-$(CONFIG_PARIDE)		+= paride.o

drivers/char/Makefile

@@ -182,14 +182,8 @@ obj-$(CONFIG_TOSHIBA) += toshiba.o
 obj-$(CONFIG_I8K) += i8k.o
 obj-$(CONFIG_DS1620) += ds1620.o
 obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
-
-subdir-$(CONFIG_FTAPE) += ftape
-ifeq ($(CONFIG_FTAPE),y)
-  obj-y       += ftape/ftape.o
-endif
-
+obj-$(CONFIG_FTAPE) += ftape/
 obj-$(CONFIG_H8) += h8.o
 obj-$(CONFIG_PPDEV) += ppdev.o
 obj-$(CONFIG_DZ) += dz.o
@@ -216,23 +210,10 @@ obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 obj-$(CONFIG_SH_WDT) += shwdt.o
 obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
-
 obj-$(CONFIG_MWAVE) += mwave/
-
-subdir-$(CONFIG_AGP) += agp
-ifeq ($(CONFIG_AGP),y)
-  obj-y += agp/agp.o
-endif
-
-subdir-$(CONFIG_DRM) += drm
-ifeq ($(CONFIG_DRM),y)
-  obj-y += drm/drm.o
-endif
-
-subdir-$(CONFIG_PCMCIA) += pcmcia
-ifeq ($(CONFIG_PCMCIA),y)
-  obj-y += pcmcia/pcmcia_char.o
-endif
+obj-$(CONFIG_AGP) += agp/
+obj-$(CONFIG_DRM) += drm/
+obj-$(CONFIG_PCMCIA) += pcmcia/
 
 include $(TOPDIR)/Rules.make
 

drivers/char/agp/Makefile

@@ -3,8 +3,6 @@
 # space ioctl interface to use agp memory.  It also adds a kernel interface
 # that other drivers could use to manipulate agp memory.
 
-O_TARGET	:= agp.o
-
 export-objs := agpgart_be.o
 
 agpgart-objs := agpgart_fe.o agpgart_be.o

drivers/char/drm/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-O_TARGET	:= drm.o
-
 gamma-objs  := gamma_drv.o gamma_dma.o
 tdfx-objs   := tdfx_drv.o
 r128-objs   := r128_drv.o r128_cce.o r128_state.o

drivers/char/ftape/Makefile

@@ -23,8 +23,6 @@
 #      Linux.
 #
 
-O_TARGET := ftape.o
-
 obj-$(CONFIG_FTAPE)		+= lowlevel/
 obj-$(CONFIG_ZFTAPE)		+= zftape/
 obj-$(CONFIG_ZFT_COMPRESSOR)	+= compressor/

drivers/char/ftape/compressor/Makefile

@@ -24,8 +24,6 @@
 #      Linux.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_ZFT_COMPRESSOR) += zft-compressor.o
 
 zft-compressor-objs := zftape-compress.o lzrw3.o

drivers/char/ftape/lowlevel/Makefile

@@ -23,8 +23,6 @@
 #      driver for Linux.
 #
 
-O_TARGET := built-in.o
-
 export-objs := ftape_syms.o
 
 obj-$(CONFIG_FTAPE) += ftape.o

drivers/char/ftape/zftape/Makefile

@@ -27,8 +27,6 @@
 # ZFT_OBSOLETE - enable the MTIOC_ZFTAPE_GETBLKSZ ioctl. You should
 #                leave this enabled for compatibility with taper.
 
-O_TARGET := built-in.o
-
 export-objs := zftape_syms.o
 
 obj-$(CONFIG_ZFTAPE) += zftape.o

drivers/char/mwave/Makefile

@@ -4,8 +4,6 @@
 # See the README file in this directory for more info. <paulsch@us.ibm.com>
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_MWAVE) += mwave.o
 
 mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o

drivers/char/pcmcia/Makefile

@@ -4,8 +4,6 @@
 # Makefile for the Linux PCMCIA char device drivers.
 #
 
-O_TARGET := pcmcia_char.o
-
 obj-$(CONFIG_PCMCIA_SERIAL_CS)	+= serial_cs.o
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
 

drivers/char/rio/Makefile

@@ -6,8 +6,6 @@
 # This file is GPL. See other files for the full Blurb. I'm lazy today. 
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_RIO) += rio.o
 
 rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \

drivers/dio/Makefile

 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-#
-# NB: cribbed from the drivers/sbus/Makefile -- PMM
-
-SUB_DIRS     :=
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
 
-L_OBJS   := dio.o
-L_TARGET := dio.a
+obj-y := dio.o
 
 include $(TOPDIR)/Rules.make

drivers/fc4/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux Fibre Channel device drivers.
 #
 
-L_TARGET := fc4.a
-
 export-objs := fc_syms.o
 
 fc4-objs := fc.o fc_syms.o

drivers/input/Makefile

@@ -19,11 +19,7 @@ obj-$(CONFIG_INPUT_MOUSEDEV)	+= mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)	+= joydev.o
 obj-$(CONFIG_INPUT_EVDEV)	+= evdev.o
 
-subdir-$(CONFIG_INPUT_JOYSTICK)	+= joystick
-
-ifeq ($(CONFIG_INPUT_JOYSTICK),y)
-	obj-y += joystick/joydrv.o
-endif
+obj-$(CONFIG_INPUT_JOYSTICK)	+= joystick/
 
 # The global Rules.make.
 

drivers/input/joystick/Makefile

@@ -2,10 +2,6 @@
 # Makefile for the input core drivers.
 #
 
-# The target object and module list name.
-
-O_TARGET	:= joydrv.o
-
 # I-Force may need both USB and RS-232
 
 CONFIG_JOYSTICK_IFORCE := n

drivers/isdn/act2000/Makefile

 # Makefile for the act2000 ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_ACT2000)	+= act2000.o
 
 # Multipart objects.
 
 act2000-objs	:= module.o capi.o act2000_isa.o
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_ACT2000)	+= act2000.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/capi/Makefile

 # Makefile for the CAPI subsystem.
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= kcapi.o capiutil.o capilib.o capifs.o
 
-# Multipart objects.
-
-kernelcapi-objs	:= kcapi.o capiutil.o capilib.o
-
 # Ordering constraints: kernelcapi.o first
 
 # Each configuration option enables a list of files.
@@ -21,6 +13,10 @@ obj-$(CONFIG_ISDN_CAPI_CAPI20)		+= capi.o
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
 obj-$(CONFIG_ISDN_CAPI_CAPIFS)		+= capifs.o
 
+# Multipart objects.
+
+kernelcapi-objs	:= kcapi.o capiutil.o capilib.o
+
 # The global Rules.make.
 
 include $(TOPDIR)/Rules.make

drivers/isdn/divert/Makefile

-#
 # Makefile for the dss1_divert ISDN module
-#
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DIVERSION)	+= dss1_divert.o
 
 # Multipart objects.
 
 dss1_divert-objs	:= isdn_divert.o divert_procfs.o divert_init.o
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DIVERSION)	+= dss1_divert.o
-
 include $(TOPDIR)/Rules.make
 
 

drivers/isdn/eicon/Makefile

 # Makefile for the eicon ISDN device driver
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= Divas_mod.o eicon_mod.o
 
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN_DRV_EICON_OLD)    	+= eicon.o
+obj-$(CONFIG_ISDN_DRV_EICON_DIVAS)	+= divas.o
+
 # Multipart objects.
 
 eicon-objs	:= eicon_mod.o eicon_isa.o eicon_pci.o eicon_idi.o \
@@ -23,9 +24,4 @@ eicon-objs-$(CONFIG_ISDN_DRV_EICON_PCI) += common.o idi.o bri.o pri.o log.o \
 
 eicon-objs 	+= $(eicon-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_EICON_OLD)    	+= eicon.o
-obj-$(CONFIG_ISDN_DRV_EICON_DIVAS)	+= divas.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/hardware/Makefile

 # Makefile for the CAPI hardware drivers
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Object files in subdirectories
 
 mod-subdirs			:= avm

drivers/isdn/hardware/avm/Makefile

 # Makefile for the AVM ISDN device drivers
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= b1dma.o b1pcmcia.o b1.o

drivers/isdn/hisax/Makefile

 # Makefile for the hisax ISDN device driver
 
-# The target object and module list name.
-
-O_TARGET	  := built-in.o
-
 # Define maximum number of cards
 
 EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
@@ -12,12 +8,22 @@ EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
 
 export-objs	  := config.o fsm.o hisax_isac.o hisax_hscx.o
 
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax.o
+obj-$(CONFIG_HISAX_SEDLBAUER_CS)	+= sedlbauer_cs.o
+obj-$(CONFIG_HISAX_ELSA_CS)		+= elsa_cs.o
+obj-$(CONFIG_HISAX_ST5481)		+= hisax_st5481.o
+obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
+obj-$(CONFIG_HISAX_FRITZ_CLASSIC)       += hisax_isac.o hisax_hscx.o hisax_fcclassic.o
+obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_hfcpci.o
+
 # Multipart objects.
 
-hisax-objs	  := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \
-		     lmgr.o q931.o callc.o fsm.o cert.o
 hisax_st5481-objs := st5481_init.o st5481_usb.o st5481_d.o st5481_b.o \
 		     st5481_hdlc.o
+hisax-objs	  := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \
+		     lmgr.o q931.o callc.o fsm.o cert.o
 
 # Optional parts of multipart objects.
 hisax-objs-$(CONFIG_HISAX_EURO) += l3dss1.o
@@ -55,16 +61,6 @@ hisax-objs-$(CONFIG_HISAX_W6692) += w6692.o
 
 hisax-objs += $(hisax-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax.o
-obj-$(CONFIG_HISAX_SEDLBAUER_CS)	+= sedlbauer_cs.o
-obj-$(CONFIG_HISAX_ELSA_CS)		+= elsa_cs.o
-obj-$(CONFIG_HISAX_ST5481)		+= hisax_st5481.o
-obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
-obj-$(CONFIG_HISAX_FRITZ_CLASSIC)       += hisax_isac.o hisax_hscx.o hisax_fcclassic.o
-obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_hfcpci.o
-
 CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
 CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
 

drivers/isdn/hysdn/Makefile

 # Makefile for the hysdn ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_HYSDN)	+= hysdn.o
 
 # Multipart objects.
 
@@ -15,8 +15,4 @@ hysdn-objs-$(CONFIG_HYSDN_CAPI) += hycapi.o
 
 hysdn-objs 	+= $(hysdn-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_HYSDN)	+= hysdn.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/i4l/Makefile

 # Makefile for the kernel ISDN subsystem and device drivers.
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= isdn_common.o
 
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN)			+= isdn.o
+obj-$(CONFIG_ISDN_PPP_BSDCOMP)		+= isdn_bsdcomp.o
+
 # Multipart objects.
 
-isdn-objs	:= isdn_net.o isdn_tty.o isdn_v110.o isdn_common.o
+isdn-objs				:= isdn_net.o isdn_tty.o \
+					   isdn_v110.o isdn_common.o
 
 # Optional parts of multipart objects.
 
@@ -21,11 +23,4 @@ isdn-objs-$(CONFIG_ISDN_TTY_FAX)	+= isdn_ttyfax.o
 
 isdn-objs				+= $(isdn-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN)			+= isdn.o
-obj-$(CONFIG_ISDN_PPP_BSDCOMP)		+= isdn_bsdcomp.o
-
-# The global Rules.make.
-
 include $(TOPDIR)/Rules.make

drivers/isdn/icn/Makefile

 # Makefile for the icn ISDN device driver
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_ISDN_DRV_ICN)	+= icn.o

drivers/isdn/isdnloop/Makefile

@@ -2,10 +2,6 @@
 # Makefile for the isdnloop ISDN device driver
 #
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_ISDN_DRV_LOOP)	+= isdnloop.o

drivers/isdn/pcbit/Makefile

 # Makefile for the pcbit ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_PCBIT)	+= pcbit.o
 
 # Multipart objects.
 
 pcbit-objs	:= module.o edss1.o drv.o layer2.o capi.o callbacks.o
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_PCBIT)	+= pcbit.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/sc/Makefile

 # Makefile for the sc ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_SC)	+= sc.o
 
 # Multipart objects.
 
 sc-objs		:= shmem.o init.o debug.o packet.o command.o event.o \
 		   ioctl.o interrupt.o message.o timer.o	
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_SC)	+= sc.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/tpam/Makefile

 # Makefile for the TurboPAM ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_TPAM)	+= tpam.o
 
 # Multipart objects.
 
-tpam-objs	:= tpam_main.o tpam_nco.o tpam_memory.o tpam_commands.o tpam_queues.o tpam_hdlc.o tpam_crcpc.o
-
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_TPAM)	+= tpam.o
+tpam-objs	:= tpam_main.o tpam_nco.o tpam_memory.o tpam_commands.o \
+		   tpam_queues.o tpam_hdlc.o tpam_crcpc.o
 
 include $(TOPDIR)/Rules.make

drivers/message/Makefile

@@ -6,15 +6,8 @@ O_TARGET := message.o
 
 mod-subdirs := i2o fusion 
 
-subdir-$(CONFIG_I2O)		+= i2o
-ifeq ($(CONFIG_I2O),y)
-  obj-y += i2o/i2o.o
-endif
-
-subdir-$(CONFIG_FUSION)		+= fusion
-ifeq ($(CONFIG_FUSION),y)
-  obj-y += fusion/fusion.o
-endif
+obj-$(CONFIG_I2O)	+= i2o/
+obj-$(CONFIG_FUSION)	+= fusion/
 
 include $(TOPDIR)/Rules.make
 

drivers/message/fusion/Makefile

@@ -43,8 +43,6 @@ EXTRA_CFLAGS += -I. ${MPT_CFLAGS}
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
 
-O_TARGET := fusion.o
-
 export-objs	:= mptbase.o mptscsih.o mptlan.o mptctl.o isense.o
 
 obj-$(CONFIG_FUSION)		+= mptbase.o mptscsih.o

drivers/message/i2o/Makefile

@@ -5,8 +5,6 @@
 # In the future, some of these should be built conditionally.
 #
 
-O_TARGET := i2o.o
-
 export-objs	:= i2o_pci.o i2o_core.o i2o_config.o i2o_block.o i2o_lan.o i2o_scsi.o i2o_proc.o
 
 obj-$(CONFIG_I2O_PCI)	+= i2o_pci.o

drivers/net/appletalk/Makefile

 #
 # Makefile for drivers/net/appletalk
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := built-in.o
 
-obj-y   :=
-obj-n   :=
-obj-m   :=
-obj-    :=
 export-objs :=
 
 obj-$(CONFIG_IPDDP) += ipddp.o

drivers/net/arcnet/Makefile

 # Makefile for linux/drivers/net/arcnet
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := built-in.o
 
-obj-y	:=
-obj-n	:=
-obj-m	:=
-obj-	:=
 export-objs := arcnet.o com20020.o
 
 obj-$(CONFIG_ARCNET) += arcnet.o

drivers/net/e100/Makefile

 #
 # Makefile for the Intel's E100 ethernet driver
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-O_TARGET := built-in.o
 
 obj-$(CONFIG_E100) += e100.o
 

drivers/net/e1000/Makefile

 #
 # Makefile for the Intel(R) PRO/1000 ethernet driver
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-O_TARGET := built-in.o
 
 obj-$(CONFIG_E1000) += e1000.o
 

drivers/net/fc/Makefile

@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_IPHASE5526)	+= iph5526.o
 
 include $(TOPDIR)/Rules.make

drivers/net/hamradio/Makefile

@@ -10,12 +10,8 @@
 #		Christoph Hellwig <hch@infradead.org>
 #
 
-
-O_TARGET := built-in.o
-
 export-objs	= hdlcdrv.o
 
-
 obj-$(CONFIG_DMASCC)		+= dmascc.o
 obj-$(CONFIG_SCC)		+= scc.o
 obj-$(CONFIG_MKISS)		+= mkiss.o

drivers/net/hamradio/soundmodem/Makefile

 #
 # Makefile for the soundmodem device driver.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now inherited from the
-# parent makes..
-#
-
-O_TARGET	:= built-in.o
 
 obj-$(CONFIG_SOUNDMODEM) += soundmodem.o
 
@@ -25,19 +16,19 @@ soundmodem-$(CONFIG_SOUNDMODEM_PSK4800)		+= sm_psk4800.o
 soundmodem-$(CONFIG_SOUNDMODEM_FSK9600)		+= sm_fsk9600.o
 soundmodem-objs					:= $(soundmodem-y)
 
-all:		all_targets
-.PHONY:		all
+include $(TOPDIR)/Rules.make
 
-gentbl:		gentbl.c
-		$(HOSTCC) $(HOSTCFLAGS) $< -o $@ -lm
+# Dependencies on generates files need to be listed explicitly
+
+sm_%.o: sm_tbl_%.h
 
-TBLHDR		:= sm_tbl_afsk1200.h sm_tbl_afsk2400_8.h 
-TBLHDR		+= sm_tbl_afsk2666.h sm_tbl_psk4800.h
-TBLHDR		+= sm_tbl_hapn4800.h sm_tbl_fsk9600.h
+TBLHDR		:= sm_tbl_afsk1200.h sm_tbl_afsk2400_7.h sm_tbl_afsk2400_8.h \
+		   sm_tbl_afsk2666.h sm_tbl_psk4800.h	 sm_tbl_hapn4800.h \
+		   sm_tbl_fsk9600.h
 
 $(TBLHDR):	gentbl
 		./gentbl
 
-fastdep:	$(TBLHDR)
+gentbl:		gentbl.c
+		$(HOSTCC) $(HOSTCFLAGS) $< -o $@ -lm
 
-include $(TOPDIR)/Rules.make

drivers/net/irda/Makefile

-# File: drivers/irda/Makefile
 #
 # Makefile for the Linux IrDA infrared port device drivers.
 #
@@ -6,11 +5,8 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := built-in.o
-
 export-objs	= irport.o
 
-
 obj-$(CONFIG_IRTTY_SIR)		+= irtty.o
 obj-$(CONFIG_IRPORT_SIR)	+= 		irport.o
 obj-$(CONFIG_USB_IRDA)		+= irda-usb.o

drivers/net/pcmcia/Makefile

 #
-# drivers/net/pcmcia/Makefile
-#
 # Makefile for the Linux PCMCIA network device drivers.
 #
 
-O_TARGET := built-in.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 # Things that need to export symbols
 export-objs	:= ray_cs.o
 

drivers/net/sk98lin/Makefile

-# File: drivers/sk98lin/Makefile
 #
 # Makefile for the SysKonnect SK-98xx device driver.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_SK98LIN) += sk98lin.o
 
 sk98lin-objs := skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \

drivers/net/skfp/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the SysKonnect FDDI PCI adapter driver
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_SKFP) += skfp.o
 
 skfp-objs :=  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \

drivers/net/tokenring/Makefile

 #
 # Makefile for drivers/net/tokenring
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := built-in.o
 
-obj-y   :=
-obj-n   :=
-obj-m   :=
-obj-    :=
 export-objs := tms380tr.o
 
 obj-$(CONFIG_IBMTR) 	+= ibmtr.o

drivers/net/tulip/Makefile

 #
-# drivers/net/tulip/Makefile
-#
 # Makefile for the Linux "Tulip" family network device drivers.
 #
 
-O_TARGET := built-in.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-# Things that need to export symbols
-export-objs	:=
-
 obj-$(CONFIG_PCMCIA_XIRTULIP)	+= xircom_tulip_cb.o
 obj-$(CONFIG_PCMCIA_XIRCOM)	+= xircom_cb.o
 obj-$(CONFIG_DM9102)		+= dmfe.o

drivers/net/wan/Makefile

@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := built-in.o
-
 export-objs :=	z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o \
 		dlci.o pc300_drv.o
 

drivers/net/wan/lmc/Makefile

-# File: drivers/lmc/Makefile
 #
 # Makefile for the Lan Media 21140 based WAN cards
 # Specifically the 1000,1200,5200,5245
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_LANMEDIA) += lmc.o
 
 lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o

drivers/net/wireless/Makefile

 #
-# drivers/net/wireless/Makefile
-#
 # Makefile for the Linux Wireless network device drivers.
 #
 
-O_TARGET := built-in.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 # Things that need to export symbols
 export-objs	:= airo.o orinoco.o hermes.o
 

drivers/nubus/Makefile

 #
 # Makefile for the nubus specific drivers.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now inherited from the
-# parent makefile.
-#
-
-L_TARGET := nubus.a
 
 export-objs := nubus_syms.o
 

drivers/scsi/Makefile

@@ -25,10 +25,8 @@ export-objs	:= scsi_syms.o 53c700.o
 mod-subdirs	:= pcmcia ../acorn/scsi
 
 
-subdir-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx
 subdir-$(CONFIG_PCMCIA)		+= pcmcia
 
-
 obj-$(CONFIG_SCSI)		+= scsi_mod.o
 
 obj-$(CONFIG_A4000T_SCSI)	+= amiga7xx.o	53c7xx.o
@@ -64,9 +62,7 @@ obj-$(CONFIG_SCSI_ULTRASTOR)	+= ultrastor.o
 obj-$(CONFIG_SCSI_AHA152X)	+= aha152x.o
 obj-$(CONFIG_SCSI_AHA1542)	+= aha1542.o
 obj-$(CONFIG_SCSI_AHA1740)	+= aha1740.o
-ifeq ($(CONFIG_SCSI_AIC7XXX),y)
-obj-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx/aic7xxx_drv.o
-endif
+obj-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx/
 obj-$(CONFIG_SCSI_AIC7XXX_OLD)	+= aic7xxx_old.o
 obj-$(CONFIG_SCSI_IPS)		+= ips.o
 obj-$(CONFIG_SCSI_FD_MCS)	+= fd_mcs.o
@@ -87,10 +83,7 @@ obj-$(CONFIG_SCSI_T128)		+= t128.o
 obj-$(CONFIG_SCSI_DMX3191D)	+= dmx3191d.o
 obj-$(CONFIG_SCSI_DTC3280)	+= dtc.o
 obj-$(CONFIG_SCSI_NCR53C7xx)	+= 53c7,8xx.o 
-subdir-$(CONFIG_SCSI_SYM53C8XX_2)	+= sym53c8xx_2
-ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y)
-  obj-$(CONFIG_SCSI_SYM53C8XX_2)	+= sym53c8xx_2/sym53c8xx_2.o
-endif
+obj-$(CONFIG_SCSI_SYM53C8XX_2)	+= sym53c8xx_2/
 obj-$(CONFIG_SCSI_SYM53C8XX)	+= sym53c8xx.o 
 obj-$(CONFIG_SCSI_NCR53C8XX)	+= ncr53c8xx.o 
 obj-$(CONFIG_SCSI_EATA_DMA)	+= eata_dma.o
@@ -123,8 +116,7 @@ obj-$(CONFIG_SCSI_FCAL)		+= fcal.o
 obj-$(CONFIG_SCSI_CPQFCTS)	+= cpqfc.o
 obj-$(CONFIG_SCSI_LASI700)	+= lasi700.o 53c700.o
 
-subdir-$(CONFIG_ARCH_ACORN)	+= ../acorn/scsi
-obj-$(CONFIG_ARCH_ACORN)	+= ../acorn/scsi/acorn-scsi.o
+obj-$(CONFIG_ARCH_ACORN)	+= ../acorn/scsi/
 
 obj-$(CONFIG_CHR_DEV_ST)	+= st.o
 obj-$(CONFIG_CHR_DEV_OSST)	+= osst.o

drivers/scsi/aic7xxx/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux aic7xxx SCSI driver.
 #
 
-O_TARGET := aic7xxx_drv.o
-
 obj-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx.o
 
 # Core files

drivers/scsi/sym53c8xx_2/Makefile

 # Makefile for the NCR/SYMBIOS/LSI 53C8XX PCI SCSI controllers driver.
 
-O_TARGET := sym53c8xx_2.o
-
 sym53c8xx-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o
 obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx.o
 

drivers/sgi/Makefile

 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-L_TARGET := sgi.a
 
 #
 # Character and Audio devices for SGI machines.

drivers/video/aty/Makefile

 
-O_TARGET := built-in.o
-
 export-objs    :=  atyfb_base.o mach64_accel.o
 
 obj-$(CONFIG_FB_ATY) += atyfb.o

drivers/video/matrox/Makefile

@@ -2,8 +2,6 @@
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com>
 # Rewritten to use lists instead of if-statements.
 
-O_TARGET := built-in.o
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 

drivers/video/riva/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Riva framebuffer driver
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_FB_RIVA) += rivafb.o
 
 rivafb-objs := fbdev.o riva_hw.o accel.o

drivers/video/sis/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the SiS framebuffer device driver
 #
 
-O_TARGET := built-in.o
-
 export-objs := sis_main.o
 
 obj-$(CONFIG_FB_SIS) += sisfb.o

fs/Makefile

@@ -23,55 +23,6 @@ obj-y += nfsctl.o
 endif
 endif
 
-subdir-$(CONFIG_PROC_FS)	+= proc
-subdir-y			+= partitions
-subdir-y			+= driverfs
-
-# Do not add any filesystems before this line
-subdir-$(CONFIG_EXT3_FS)	+= ext3    # Before ext2 so root fs can be ext3
-subdir-$(CONFIG_JBD)		+= jbd
-subdir-$(CONFIG_EXT2_FS)	+= ext2
-subdir-$(CONFIG_CRAMFS)		+= cramfs
-subdir-$(CONFIG_RAMFS)		+= ramfs
-subdir-$(CONFIG_CODA_FS)	+= coda
-subdir-$(CONFIG_INTERMEZZO_FS)	+= intermezzo
-subdir-$(CONFIG_MINIX_FS)	+= minix
-subdir-$(CONFIG_FAT_FS)		+= fat
-subdir-$(CONFIG_UMSDOS_FS)	+= umsdos
-subdir-$(CONFIG_MSDOS_FS)	+= msdos
-subdir-$(CONFIG_VFAT_FS)	+= vfat
-subdir-$(CONFIG_BFS_FS)		+= bfs
-subdir-$(CONFIG_ISO9660_FS)	+= isofs
-subdir-$(CONFIG_DEVFS_FS)	+= devfs
-subdir-$(CONFIG_HFS_FS)		+= hfs
-subdir-$(CONFIG_VXFS_FS)	+= freevxfs
-subdir-$(CONFIG_NFS_FS)		+= nfs
-subdir-$(CONFIG_EXPORTFS)	+= exportfs
-subdir-$(CONFIG_NFSD)		+= nfsd
-subdir-$(CONFIG_LOCKD)		+= lockd
-subdir-$(CONFIG_NLS)		+= nls
-subdir-$(CONFIG_SYSV_FS)	+= sysv
-subdir-$(CONFIG_SMB_FS)		+= smbfs
-subdir-$(CONFIG_NCP_FS)		+= ncpfs
-subdir-$(CONFIG_HPFS_FS)	+= hpfs
-subdir-$(CONFIG_NTFS_FS)	+= ntfs
-subdir-$(CONFIG_UFS_FS)		+= ufs
-subdir-$(CONFIG_EFS_FS)		+= efs
-subdir-$(CONFIG_JFFS_FS)	+= jffs
-subdir-$(CONFIG_JFFS2_FS)	+= jffs2
-subdir-$(CONFIG_AFFS_FS)	+= affs
-subdir-$(CONFIG_ROMFS_FS)	+= romfs
-subdir-$(CONFIG_QNX4FS_FS)	+= qnx4
-subdir-$(CONFIG_UDF_FS)		+= udf
-subdir-$(CONFIG_AUTOFS_FS)	+= autofs
-subdir-$(CONFIG_AUTOFS4_FS)	+= autofs4
-subdir-$(CONFIG_ADFS_FS)	+= adfs
-subdir-$(CONFIG_REISERFS_FS)	+= reiserfs
-subdir-$(CONFIG_DEVPTS_FS)	+= devpts
-subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
-subdir-$(CONFIG_JFS_FS)		+= jfs
-
-
 obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o
 obj-$(CONFIG_BINFMT_EM86)	+= binfmt_em86.o
 obj-$(CONFIG_BINFMT_MISC)	+= binfmt_misc.o
@@ -85,8 +36,52 @@ obj-$(CONFIG_QUOTA) += dquot.o
 obj-$(CONFIG_QFMT_V1)		+= quota_v1.o
 obj-$(CONFIG_QFMT_V2)		+= quota_v2.o
 
-# persistent filesystems
-obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
+obj-$(CONFIG_PROC_FS)		+= proc/
+obj-y				+= partitions/
+obj-y				+= driverfs/
 
+# Do not add any filesystems before this line
+obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3
+obj-$(CONFIG_JBD)		+= jbd/
+obj-$(CONFIG_EXT2_FS)		+= ext2/
+obj-$(CONFIG_CRAMFS)		+= cramfs/
+obj-$(CONFIG_RAMFS)		+= ramfs/
+obj-$(CONFIG_CODA_FS)		+= coda/
+obj-$(CONFIG_INTERMEZZO_FS)	+= intermezzo/
+obj-$(CONFIG_MINIX_FS)		+= minix/
+obj-$(CONFIG_FAT_FS)		+= fat/
+obj-$(CONFIG_UMSDOS_FS)		+= umsdos/
+obj-$(CONFIG_MSDOS_FS)		+= msdos/
+obj-$(CONFIG_VFAT_FS)		+= vfat/
+obj-$(CONFIG_BFS_FS)		+= bfs/
+obj-$(CONFIG_ISO9660_FS)	+= isofs/
+obj-$(CONFIG_DEVFS_FS)		+= devfs/
+obj-$(CONFIG_HFS_FS)		+= hfs/
+obj-$(CONFIG_VXFS_FS)		+= freevxfs/
+obj-$(CONFIG_NFS_FS)		+= nfs/
+obj-$(CONFIG_EXPORTFS)		+= exportfs/
+obj-$(CONFIG_NFSD)		+= nfsd/
+obj-$(CONFIG_LOCKD)		+= lockd/
+obj-$(CONFIG_NLS)		+= nls/
+obj-$(CONFIG_SYSV_FS)		+= sysv/
+obj-$(CONFIG_SMB_FS)		+= smbfs/
+obj-$(CONFIG_NCP_FS)		+= ncpfs/
+obj-$(CONFIG_HPFS_FS)		+= hpfs/
+obj-$(CONFIG_NTFS_FS)		+= ntfs/
+obj-$(CONFIG_UFS_FS)		+= ufs/
+obj-$(CONFIG_EFS_FS)		+= efs/
+obj-$(CONFIG_JFFS_FS)		+= jffs/
+obj-$(CONFIG_JFFS2_FS)		+= jffs2/
+obj-$(CONFIG_AFFS_FS)		+= affs/
+obj-$(CONFIG_ROMFS_FS)		+= romfs/
+obj-$(CONFIG_QNX4FS_FS)		+= qnx4/
+obj-$(CONFIG_UDF_FS)		+= udf/
+obj-$(CONFIG_AUTOFS_FS)		+= autofs/
+obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
+obj-$(CONFIG_ADFS_FS)		+= adfs/
+obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
+obj-$(CONFIG_DEVPTS_FS)		+= devpts/
+obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+obj-$(CONFIG_JFS_FS)		+= jfs/
 
 include $(TOPDIR)/Rules.make

fs/adfs/Makefile

 #
 # Makefile for the linux adfs filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
 
-O_TARGET := adfs.o
+obj-$(CONFIG_ADFS_FS) += adfs.o
 
-obj-y    := dir.o dir_f.o dir_fplus.o file.o inode.o map.o super.o
-obj-m    := $(O_TARGET)
+adfs-objs := dir.o dir_f.o dir_fplus.o file.o inode.o map.o super.o
 
 include $(TOPDIR)/Rules.make

fs/affs/Makefile

 #
 # Makefile for the Linux affs filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
 
 #EXTRA_CFLAGS=-DDEBUG=1
 
-O_TARGET := affs.o
+obj-$(CONFIG_AFFS_FS) += affs.o
 
-obj-y   := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o
-obj-m   := $(O_TARGET)
+affs-objs := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o
 
 include $(TOPDIR)/Rules.make

fs/autofs/Makefile

 #
 # Makefile for the linux autofs-filesystem routines.
 #
-# We can build this either out of the kernel tree or the autofs tools tree.
-#
 
-O_TARGET := autofs.o
+obj-$(CONFIG_AUTOFS_FS) += autofs.o
 
-obj-y   := dirhash.o init.o inode.o root.o symlink.o waitq.o
-obj-m   := $(O_TARGET)
+autofs-objs := dirhash.o init.o inode.o root.o symlink.o waitq.o
 
 include $(TOPDIR)/Rules.make

fs/autofs4/Makefile

 #
 # Makefile for the linux autofs-filesystem routines.
 #
-# We can build this either out of the kernel tree or the autofs tools tree.
-#
-
-O_TARGET := autofs4.o
 
-obj-y   := init.o inode.o root.o symlink.o waitq.o expire.o
+obj-$(CONFIG_AUTOFS4_FS) += autofs4.o
 
-obj-m   := $(O_TARGET)
+autofs4-objs := init.o inode.o root.o symlink.o waitq.o expire.o
 
 include $(TOPDIR)/Rules.make

fs/bfs/Makefile

 #
 # Makefile for BFS filesystem.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main Makefile...
 
-O_TARGET := bfs.o
+obj-$(CONFIG_BFS_FS) += bfs.o
 
-obj-y   := inode.o file.o dir.o
-obj-m   := $(O_TARGET)
+bfs-objs := inode.o file.o dir.o
 
 include $(TOPDIR)/Rules.make

fs/coda/Makefile

@@ -2,11 +2,10 @@
 # Makefile for the Linux Coda filesystem routines.
 #
 
-O_TARGET := coda.o
+obj-$(CONFIG_CODA_FS) += coda.o
 
-obj-y   := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o coda_linux.o\
-           symlink.o pioctl.o sysctl.o 
-obj-m   := $(O_TARGET)
+coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
+	     coda_linux.o symlink.o pioctl.o sysctl.o 
 
 # If you want debugging output, please uncomment the following line.
 

fs/cramfs/Makefile

@@ -2,10 +2,8 @@
 # Makefile for the linux cramfs routines.
 #
 
-O_TARGET := cramfs.o
+obj-$(CONFIG_CRAMFS) += cramfs.o
 
-obj-y  := inode.o uncompress.o
-
-obj-m := $(O_TARGET)
+cramfs-objs := inode.o uncompress.o
 
 include $(TOPDIR)/Rules.make

fs/devfs/Makefile

 #
 # Makefile for the linux devfs-filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-O_TARGET := devfs.o
 
 export-objs := base.o util.o
 
-obj-y   := base.o util.o
+obj-$(CONFIG_DEVFS_FS) += devfs.o
+
+devfs-objs := base.o util.o
 
 # Special case to support building documentation
 ifndef TOPDIR

fs/devpts/Makefile

@@ -2,10 +2,8 @@
 # Makefile for the Linux /dev/pts virtual filesystem.
 #
 
-O_TARGET := devpts.o
+obj-$(CONFIG_DEVPTS_FS) += devpts.o
 
-obj-y    := root.o inode.o
-
-obj-m    := $(O_TARGET)
+devpts-objs := root.o inode.o
 
 include $(TOPDIR)/Rules.make

fs/driverfs/Makefile

-O_TARGET := driverfs.o
+#
+# Makefile for the driverfs virtual filesystem.
+#
 
 export-objs := inode.o
 
 obj-y := inode.o
-obj-m := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/efs/Makefile

 #
 # Makefile for the linux efs-filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
-O_TARGET := efs.o
+obj-$(CONFIG_EFS_FS) += efs.o
 
-obj-y    := super.o inode.o namei.o dir.o file.o symlink.o
-obj-m    := $(O_TARGET)
+efs-objs := super.o inode.o namei.o dir.o file.o symlink.o
 
 include $(TOPDIR)/Rules.make

fs/exportfs/Makefile

 #
 # Makefile for the filesystem export support routines.
 
-O_TARGET := exportfs.o
-
 export-objs := expfs.o
 
-obj-y :=    expfs.o
-obj-m := $(O_TARGET)
+obj-$(CONFIG_EXPORTFS) += exportfs.o
+
+exportfs-objs := expfs.o
 
 include $(TOPDIR)/Rules.make

fs/ext2/Makefile

 #
 # Makefile for the linux ext2-filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
-O_TARGET := ext2.o
+obj-$(CONFIG_EXT2_FS) += ext2.o
 
-obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+ext2-objs := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 	     ioctl.o namei.o super.o symlink.o
-obj-m    := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/ext3/Makefile

 #
-# Makefile for the linux ext2-filesystem routines.
+# Makefile for the linux ext3-filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
-O_TARGET := ext3.o
+obj-$(CONFIG_EXT3_FS) += ext3.o
 
-obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+ext3-objs    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 		ioctl.o namei.o super.o symlink.o
-obj-m    := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/fat/Makefile

 #
 # Makefile for the Linux fat filesystem support.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
-
-O_TARGET := fat.o
 
 export-objs := fatfs_syms.o
 
-obj-y    := buffer.o cache.o dir.o file.o inode.o misc.o cvf.o fatfs_syms.o
-obj-m    := $(O_TARGET)
+obj-$(CONFIG_FAT_FS) += fat.o
+
+fat-objs := buffer.o cache.o dir.o file.o inode.o misc.o cvf.o fatfs_syms.o
 
 include $(TOPDIR)/Rules.make

fs/freevxfs/Makefile

@@ -2,10 +2,9 @@
 # VxFS Makefile
 #
 
-O_TARGET :=	freevxfs.o
+obj-$(CONFIG_VXFS_FS) += freevxfs.o
 
-obj-y :=	vxfs_bmap.o vxfs_fshead.o vxfs_immed.o vxfs_inode.o \
+freevxfs-objs := vxfs_bmap.o vxfs_fshead.o vxfs_immed.o vxfs_inode.o \
 		 vxfs_lookup.o vxfs_olt.o vxfs_subr.o vxfs_super.o
-obj-m :=	$(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/hfs/Makefile

 #
 # Makefile for the Linux hfs filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
 
-O_TARGET := hfs.o
+obj-$(CONFIG_HFS_FS) += hfs.o
 
-obj-y    := balloc.o bdelete.o bfind.o bins_del.o binsert.o bitmap.o bitops.o \
+hfs-objs := balloc.o bdelete.o bfind.o bins_del.o binsert.o bitmap.o bitops.o \
 	    bnode.o brec.o btree.o catalog.o dir.o dir_cap.o dir_dbl.o \
 	    dir_nat.o extent.o file.o file_cap.o file_hdr.o inode.o mdb.o \
             part_tbl.o string.o super.o sysdep.o trans.o version.o
 
-obj-m    := $(O_TARGET)
-
 include $(TOPDIR)/Rules.make

fs/hpfs/Makefile

-O_TARGET := hpfs.o
+#
+# Makefile for the Linux hpfs filesystem routines.
+#
 
-obj-y := alloc.o anode.o buffer.o dentry.o dir.o dnode.o ea.o file.o inode.o map.o name.o namei.o super.o
-obj-m := $(O_TARGET)
+obj-$(CONFIG_HPFS_FS) += hpfs.o
+
+hpfs-objs := alloc.o anode.o buffer.o dentry.o dir.o dnode.o ea.o file.o \
+	     inode.o map.o name.o namei.o super.o
 
 include $(TOPDIR)/Rules.make

fs/intermezzo/Makefile

@@ -2,11 +2,11 @@
 # Makefile 1.00 Peter Braam <braam@clusterfs.com>
 #
 
-O_TARGET := intermezzo.o
+obj-$(CONFIG_INTERMEZZO_FS) += intermezzo.o
 
-obj-y :=  journal_reiserfs.o cache.o  journal.o presto.o vfs.o psdev.o upcall.o methods.o sysctl.o dcache.o  dir.o  super.o journal_ext2.o journal_ext3.o journal_xfs.o  inode.o  file.o journal_obdfs.o
-
-
-obj-m := $(O_TARGET)
+intermezzo-objs := journal_reiserfs.o cache.o journal.o presto.o vfs.o \
+		   psdev.o upcall.o methods.o sysctl.o dcache.o dir.o \
+		   super.o journal_ext2.o journal_ext3.o journal_xfs.o \
+		   inode.o  file.o journal_obdfs.o
 
 include $(TOPDIR)/Rules.make

fs/isofs/Makefile

 #
 # Makefile for the Linux isofs filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
-
-O_TARGET := isofs.o
 
-obj-y  := namei.o inode.o dir.o util.o rock.o
-obj-$(CONFIG_JOLIET) += joliet.o
-obj-$(CONFIG_ZISOFS) += compress.o
+obj-$(CONFIG_ISO9660_FS) += isofs.o
 
-obj-m  := $(O_TARGET)
+isofs-objs-y 			:= namei.o inode.o dir.o util.o rock.o
+isofs-objs-$(CONFIG_JOLIET)	+= joliet.o
+isofs-objs-$(CONFIG_ZISOFS)	+= compress.o
+isofs-objs			:= $(isofs-objs-y)
 
 include $(TOPDIR)/Rules.make

fs/jbd/Makefile

 #
-# fs/jbd/Makefile
-# 
 # Makefile for the linux journaling routines.
 #
 
 export-objs := journal.o
-O_TARGET := jbd.o
 
-obj-y   := transaction.o commit.o recovery.o checkpoint.o revoke.o journal.o
+obj-$(CONFIG_JBD) += jbd.o
 
-obj-m   := $(O_TARGET)
+jbd-objs := transaction.o commit.o recovery.o checkpoint.o revoke.o journal.o
 
 include $(TOPDIR)/Rules.make
 

fs/jffs/Makefile

@@ -4,21 +4,11 @@
 # $Id: Makefile,v 1.11 2001/09/25 20:59:41 dwmw2 Exp $
 #
 
-obj-y := jffs_fm.o intrep.o
+obj-$(CONFIG_JFFS_FS) += jffs.o
 
-ifeq ($(PATCHLEVEL),2)
-	obj-y += inode-v22.o
-else
-	obj-y += inode-v23.o
-endif
-
-ifeq ($(CONFIG_JFFS_PROC_FS),y)
-	obj-y += jffs_proc.o
-endif
-
-O_TARGET := jffs.o
-
-obj-m := $(O_TARGET)
+jffs-y 				:= jffs_fm.o intrep.o inode-v23.o
+jffs-$(CONFIG_JFFS_PROC_FS)	+= jffs_proc.o
+jffs-objs			:= $(jffs-y)
 
 include $(TOPDIR)/Rules.make
 

fs/jffs2/Makefile

@@ -3,12 +3,8 @@
 #
 # $Id: Makefile,v 1.34 2002/03/08 11:27:59 dwmw2 Exp $
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
+obj-$(CONFIG_JFFS2_FS) += jffs2.o
 
 COMPR_OBJS	:= compr.o compr_rubin.o compr_rtime.o compr_zlib.o
 JFFS2_OBJS	:= dir.o file.o ioctl.o nodelist.o malloc.o \
@@ -20,11 +16,8 @@ LINUX_OBJS-25	:= super.o
 
 NAND_OBJS-$(CONFIG_JFFS2_FS_NAND)	:= wbuf.o
 
-O_TARGET := jffs2.o
-
-obj-y := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
+jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
 	      $(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
-obj-m := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make
 

fs/jfs/Makefile

 #
 # Makefile for the Linux JFS filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
 
-O_TARGET := jfs.o
-obj-y   := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \
+obj-$(CONFIG_JFS_FS) += jfs.o
+
+jfs-objs := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \
 	    jfs_xtree.o jfs_imap.o jfs_debug.o jfs_dmap.o \
 	    jfs_unicode.o jfs_dtree.o jfs_inode.o \
 	    jfs_extent.o symlink.o jfs_metapage.o \
 	    jfs_logmgr.o jfs_txnmgr.o jfs_uniupr.o
-obj-m   := $(O_TARGET)
 
 EXTRA_CFLAGS += -D_JFS_4K
 

fs/lockd/Makefile

 #
 # Makefile for the linux lock manager stuff
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-O_TARGET := lockd.o
 
 export-objs := lockd_syms.o
 
-obj-y    := clntlock.o clntproc.o host.o svc.o svclock.o svcshare.o \
-	    svcproc.o svcsubs.o mon.o xdr.o lockd_syms.o
+obj-$(CONFIG_LOCKD) += lockd.o
 
-obj-$(CONFIG_LOCKD_V4) += xdr4.o svc4proc.o
-
-obj-m    := $(O_TARGET)
+lockd-objs-y := clntlock.o clntproc.o host.o svc.o svclock.o svcshare.o \
+	        svcproc.o svcsubs.o mon.o xdr.o lockd_syms.o
+lockd-objs-$(CONFIG_LOCKD_V4) += xdr4.o svc4proc.o
+lockd-objs		      := $(lockd-objs-y)
 
 include $(TOPDIR)/Rules.make

fs/minix/Makefile

 #
 # Makefile for the Linux minix filesystem routines.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile.
 
-O_TARGET := minix.o
+obj-$(CONFIG_MINIX_FS) += minix.o
 
-obj-y    := bitmap.o itree_v1.o itree_v2.o namei.o inode.o file.o dir.o
-obj-m    := $(O_TARGET)
+minix-objs := bitmap.o itree_v1.o itree_v2.o namei.o inode.o file.o dir.o
 
 include $(TOPDIR)/Rules.make