kbuild: Use standard multi-part object declaration in fs/*

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

fs/msdos/Makefile

 #
 # Makefile for the Linux msdos 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 := msdos.o
 
 export-objs := msdosfs_syms.o
 
-obj-y := namei.o msdosfs_syms.o
-obj-m := $(O_TARGET)
+obj-$(CONFIG_MSDOS_FS) += msdos.o
+
+msdos-objs := namei.o msdosfs_syms.o
 
 include $(TOPDIR)/Rules.make

fs/ncpfs/Makefile

 #
 # Makefile for the linux ncp 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 := ncpfs.o
+obj-$(CONFIG_NCP_FS) += ncpfs.o
 
-obj-y    := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \
+ncpfs-objs   := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \
 		symlink.o ncpsign_kernel.o
-obj-m    := $(O_TARGET)
 
 # If you want debugging output, please uncomment the following line
 # EXTRA_CFLAGS += -DDEBUG_NCP=1

fs/nfs/Makefile

 #
 # Makefile for the Linux nfs 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 := nfs.o
-
-obj-y    := dir.o file.o flushd.o inode.o nfs2xdr.o pagelist.o proc.o \
-	    read.o symlink.o unlink.o write.o
 
-obj-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o      
-obj-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o
+obj-$(CONFIG_NFS_FS) += nfs.o
 
-obj-m   := $(O_TARGET)
+nfs-y 			:= dir.o file.o flushd.o inode.o nfs2xdr.o pagelist.o \
+			   proc.o read.o symlink.o unlink.o write.o
+nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o mount_clnt.o      
+nfs-$(CONFIG_NFS_V3)	+= nfs3proc.o nfs3xdr.o
+nfs-objs		:= $(nfs-y)
 
 include $(TOPDIR)/Rules.make

fs/nfsd/Makefile

 #
-# Makefile for the Linux nfs filesystem routines.
+# Makefile for the Linux nfs server
 #
-# 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 := nfsd.o
-
-obj-y :=    nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
-	    export.o auth.o lockd.o nfscache.o nfsxdr.o \
-	    stats.o
 
-obj-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o
+obj-$(CONFIG_NFSD)	+= nfsd.o
 
-obj-m := $(O_TARGET)
+nfsd-y 			:= nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
+			   export.o auth.o lockd.o nfscache.o nfsxdr.o stats.o
+nfsd-$(CONFIG_NFSD_V3)	+= nfs3proc.o nfs3xdr.o
+nfsd-objs		:= $(nfsd-y)
 
 include $(TOPDIR)/Rules.make

fs/nls/Makefile

@@ -2,13 +2,9 @@
 # Makefile for native language support
 #
 
-O_TARGET = nls.o
 export-objs := nls_base.o
 
-obj-y	:=	nls_base.o
-obj-m	:=
-obj-n	:=
-obj-	:=
+obj-$(CONFIG_NLS)		+= nls_base.o
 
 obj-$(CONFIG_NLS_CODEPAGE_437)	+= nls_cp437.o
 obj-$(CONFIG_NLS_CODEPAGE_737)	+= nls_cp737.o
@@ -30,14 +26,8 @@ obj-$(CONFIG_NLS_CODEPAGE_932)	+= nls_cp932.o nls_sjis.o nls_euc-jp.o
 obj-$(CONFIG_NLS_CODEPAGE_936)	+= nls_cp936.o nls_gb2312.o
 obj-$(CONFIG_NLS_CODEPAGE_949)	+= nls_cp949.o nls_euc-kr.o
 obj-$(CONFIG_NLS_CODEPAGE_950)	+= nls_cp950.o nls_big5.o
-obj-$(CONFIG_NLS_CODEPAGE_1250)	+= nls_cp1250.o
 obj-$(CONFIG_NLS_CODEPAGE_1251)	+= nls_cp1251.o
-obj-$(CONFIG_NLS_CODEPAGE_1252)	+= nls_cp1252.o
-obj-$(CONFIG_NLS_CODEPAGE_1253)	+= nls_cp1253.o
-obj-$(CONFIG_NLS_CODEPAGE_1254)	+= nls_cp1254.o
-obj-$(CONFIG_NLS_CODEPAGE_1256)	+= nls_cp1256.o
-obj-$(CONFIG_NLS_CODEPAGE_1257)	+= nls_cp1257.o
-obj-$(CONFIG_NLS_CODEPAGE_1258)	+= nls_cp1258.o
+obj-$(CONFIG_NLS_CODEPAGE_1255)	+= nls_cp1255.o
 obj-$(CONFIG_NLS_ISO8859_1)	+= nls_iso8859-1.o
 obj-$(CONFIG_NLS_ISO8859_2)	+= nls_iso8859-2.o
 obj-$(CONFIG_NLS_ISO8859_3)	+= nls_iso8859-3.o

fs/ntfs/Makefile

 # Rules for making the NTFS driver.
 
-O_TARGET := ntfs.o
+obj-$(CONFIG_NTFS_FS) += ntfs.o
 
-obj-y   := aops.o attrib.o compress.o debug.o dir.o file.o inode.o mft.o \
+ntfs-objs := aops.o attrib.o compress.o debug.o dir.o file.o inode.o mft.o \
 	     mst.o namei.o super.o sysctl.o time.o unistr.o upcase.o
 
-obj-m   := $(O_TARGET)
-
 EXTRA_CFLAGS = -DNTFS_VERSION=\"2.0.7\"
 
 ifeq ($(CONFIG_NTFS_DEBUG),y)

fs/openpromfs/Makefile

 #
-# Makefile for the Linux minix filesystem routines.
+# Makefile for the Linux Sun Openprom 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 := openpromfs.o
+obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs.o
 
-obj-y   := inode.o
-obj-m   := $(O_TARGET)
+openpromfs-objs := inode.o
 
 include $(TOPDIR)/Rules.make

fs/partitions/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...
-
-O_TARGET := partitions.o
 
 export-objs := check.o ibm.o msdos.o
 

fs/proc/Makefile

 #
 # Makefile for the Linux proc 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 := proc.o
 
 export-objs := root.o
 
-obj-y    := inode.o root.o base.o generic.o array.o \
+obj-$(CONFIG_PROC_FS) += proc.o
+
+proc-objs    := inode.o root.o base.o generic.o array.o \
 		kmsg.o proc_tty.o proc_misc.o kcore.o
 
 ifeq ($(CONFIG_PROC_DEVICETREE),y)
-obj-y += proc_devtree.o
+proc-objs    += proc_devtree.o
 endif
 
 include $(TOPDIR)/Rules.make

fs/qnx4/Makefile

 #
 # Makefile for the linux qnx4-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 := qnx4.o
+obj-$(CONFIG_QNX4FS_FS) += qnx4.o
 
-obj-y   := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o
-obj-m   := $(O_TARGET)
+qnx4-objs := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o
 
 include $(TOPDIR)/Rules.make

fs/ramfs/Makefile

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

fs/reiserfs/Makefile

 #
 # Makefile for the linux reiser-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 := reiserfs.o
-obj-y   := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o super.o prints.o objectid.o \
-lbalance.o ibalance.o stree.o hashes.o buffer2.o tail_conversion.o journal.o resize.o item_ops.o ioctl.o procfs.o
+obj-$(CONFIG_REISERFS_FS) += reiserfs.o
 
-obj-m   := $(O_TARGET)
+reiserfs-objs := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o \
+		 super.o prints.o objectid.o lbalance.o ibalance.o stree.o \
+		 hashes.o buffer2.o tail_conversion.o journal.o resize.o \
+		 item_ops.o ioctl.o procfs.o
 
 # gcc -O2 (the kernel default)  is overaggressive on ppc32 when many inline
 # functions are used.  This causes the compiler to advance the stack

fs/romfs/Makefile

 #
 # Makefile for the linux romfs 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 := romfs.o
+obj-$(CONFIG_ROMFS_FS) += romfs.o
 
-obj-y  := inode.o
-obj-m  := $(O_TARGET)
+romfs-objs := inode.o
 
 include $(TOPDIR)/Rules.make

fs/smbfs/Makefile

 #
 # Makefile for the linux smb-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 := smbfs.o
+obj-$(CONFIG_SMB_FS) += smbfs.o
 
-obj-y   := proc.o dir.o cache.o sock.o inode.o file.o ioctl.o getopt.o
-obj-m   := $(O_TARGET)
+smbfs-objs := proc.o dir.o cache.o sock.o inode.o file.o ioctl.o getopt.o
 
 # If you want debugging output, you may add these flags to the EXTRA_CFLAGS
 # SMBFS_PARANOIA should normally be enabled.

fs/sysv/Makefile

 #
 # Makefile for the Linux SystemV/Coherent 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 := sysv.o
+obj-$(CONFIG_SYSV_FS) += sysv.o
 
-obj-y   := ialloc.o balloc.o inode.o itree.o file.o dir.o \
+sysv-objs := ialloc.o balloc.o inode.o itree.o file.o dir.o \
 	     namei.o super.o symlink.o
-obj-m   := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/udf/Makefile

 #
 # Makefile for the linux udf-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 .o file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile..
 
-O_TARGET := udf.o
+obj-$(CONFIG_UDF_FS) += udf.o
 
-obj-y    := balloc.o dir.o file.o ialloc.o inode.o lowlevel.o namei.o \
+udf-objs     := balloc.o dir.o file.o ialloc.o inode.o lowlevel.o namei.o \
 		partition.o super.o truncate.o symlink.o fsync.o \
 		crc.o directory.o misc.o udftime.o unicode.o
-obj-m    := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/ufs/Makefile

 #
 # Makefile for the Linux ufs 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 := ufs.o
+obj-$(CONFIG_UFS_FS) += ufs.o
 
-obj-y   := balloc.o cylinder.o dir.o file.o ialloc.o inode.o \
+ufs-objs := balloc.o cylinder.o dir.o file.o ialloc.o inode.o \
 	    namei.o super.o symlink.o truncate.o util.o
-obj-m   := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

fs/umsdos/Makefile

 #
 # Makefile for the umsdos Unix-like 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 := umsdos.o
 
-obj-y   := dir.o  inode.o ioctl.o mangle.o namei.o rdir.o emd.o
+obj-$(CONFIG_UMSDOS) += umsdos.o
 
-obj-m   := $(O_TARGET)
+umsdos-objs := dir.o  inode.o ioctl.o mangle.o namei.o rdir.o emd.o
 
 include $(TOPDIR)/Rules.make
 

fs/vfat/Makefile

 #
 # Makefile for the linux vfat-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 := vfat.o
 
 export-objs := vfatfs_syms.o
 
-obj-y := namei.o vfatfs_syms.o
-obj-m := $(O_TARGET)
+obj-$(CONFIG_VFAT_FS) += vfat.o
+
+vfat-objs := namei.o vfatfs_syms.o
 
 include $(TOPDIR)/Rules.make