Import of Linux/MIPS 2.1.14

1 files changed, 137 insertions, 68 deletions

diff --git a/fs/Makefile b/fs/Makefile
index 7f2b18f5f..4359e3acc 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -7,112 +7,181 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-SUBDIRS = minix ext ext2 msdos proc isofs nfs xiafs umsdos hpfs sysv
+L_TARGET := filesystems.a
+L_OBJS    = $(join $(SUB_DIRS),$(SUB_DIRS:%=/%.o))
+O_TARGET := fs.o
+O_OBJS    = open.o read_write.o inode.o devices.o file_table.o buffer.o \
+		super.o  block_dev.o stat.o exec.o pipe.o namei.o fcntl.o \
+		ioctl.o readdir.o select.o fifo.o locks.o filesystems.o \
+		dcache.o $(BINFMTS) 
+
+MOD_LIST_NAME := FS_MODULES
+ALL_SUB_DIRS = minix ext ext2 fat msdos vfat proc isofs nfs xiafs umsdos \
+		hpfs sysv smbfs ncpfs ufs affs
+
+ifeq ($(CONFIG_QUOTA),y)
+O_OBJS += dquot.o
+else
+O_OBJS += noquot.o
+endif
 
-ifdef CONFIG_MINIX_FS
-FS_SUBDIRS := $(FS_SUBDIRS) minix
+ifeq ($(CONFIG_MINIX_FS),y)
+SUB_DIRS += minix
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) minix
+  ifeq ($(CONFIG_MINIX_FS),m)
+  MOD_SUB_DIRS += minix
+  endif
 endif
 
-ifdef CONFIG_EXT_FS
-FS_SUBDIRS := $(FS_SUBDIRS) ext
+ifeq ($(CONFIG_EXT_FS),y)
+SUB_DIRS += ext
+else
+  ifeq ($(CONFIG_EXT_FS),m)
+  MOD_SUB_DIRS += ext
+  endif
 endif
 
-ifdef CONFIG_EXT2_FS
-FS_SUBDIRS := $(FS_SUBDIRS) ext2
+ifeq ($(CONFIG_EXT2_FS),y)
+SUB_DIRS += ext2
+else
+  ifeq ($(CONFIG_EXT2_FS),m)
+  MOD_SUB_DIRS += ext2
+  endif
 endif
 
-ifdef CONFIG_MSDOS_FS
-FS_SUBDIRS := $(FS_SUBDIRS) msdos
+ifeq ($(CONFIG_FAT_FS),y)
+SUB_DIRS += fat
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) msdos
+  ifeq ($(CONFIG_FAT_FS),m)
+  MOD_SUB_DIRS += fat
+  endif
 endif
 
-ifdef CONFIG_PROC_FS
-FS_SUBDIRS := $(FS_SUBDIRS) proc
+ifeq ($(CONFIG_MSDOS_FS),y)
+SUB_DIRS += msdos
+else
+  ifeq ($(CONFIG_MSDOS_FS),m)
+  MOD_SUB_DIRS += msdos
+  endif
 endif
 
-ifdef CONFIG_ISO9660_FS
-FS_SUBDIRS := $(FS_SUBDIRS) isofs
+ifeq ($(CONFIG_VFAT_FS),y)
+SUB_DIRS += vfat
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) isofs
+  ifeq ($(CONFIG_VFAT_FS),m)
+  MOD_SUB_DIRS += vfat
+  endif
+endif
+
+ifdef CONFIG_PROC_FS
+SUB_DIRS += proc
 endif
 
-ifdef CONFIG_NFS_FS
-FS_SUBDIRS := $(FS_SUBDIRS) nfs
+ifeq ($(CONFIG_ISO9660_FS),y)
+SUB_DIRS += isofs
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) nfs
+  ifeq ($(CONFIG_ISO9660_FS),m)
+  MOD_SUB_DIRS += isofs
+  endif
 endif
 
-ifdef CONFIG_XIA_FS
-FS_SUBDIRS := $(FS_SUBDIRS) xiafs
+ifeq ($(CONFIG_NFS_FS),y)
+SUB_DIRS += nfs
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) xiafs
+  ifeq ($(CONFIG_NFS_FS),m)
+  MOD_SUB_DIRS += nfs
+  endif
 endif
 
-ifdef CONFIG_UMSDOS_FS
-FS_SUBDIRS := $(FS_SUBDIRS) umsdos
+ifeq ($(CONFIG_XIA_FS),y)
+SUB_DIRS += xiafs
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) umsdos
+  ifeq ($(CONFIG_XIA_FS),m)
+  MOD_SUB_DIRS += xiafs
+  endif
 endif
 
-ifdef CONFIG_SYSV_FS
-FS_SUBDIRS := $(FS_SUBDIRS) sysv
+ifeq ($(CONFIG_UMSDOS_FS),y)
+SUB_DIRS += umsdos
 else
-MODULE_FS_SUBDIRS := $(MODULE_FS_SUBDIRS) sysv
+  ifeq ($(CONFIG_UMSDOS_FS),m)
+  MOD_SUB_DIRS += umsdos
+  endif
 endif
 
-ifdef CONFIG_HPFS_FS
-FS_SUBDIRS := $(FS_SUBDIRS) hpfs
+ifeq ($(CONFIG_SYSV_FS),y)
+SUB_DIRS += sysv
+else
+  ifeq ($(CONFIG_SYSV_FS),m)
+  MOD_SUB_DIRS += sysv
+  endif
 endif
 
-ifdef CONFIG_BINFMT_ELF
-BINFMTS := $(BINFMTS) binfmt_elf.o
+ifeq ($(CONFIG_SMB_FS),y)
+SUB_DIRS += smbfs
 else
-MODULE_OBJS := $(MODULE_OBJS) binfmt_elf.o
+  ifeq ($(CONFIG_SMB_FS),m)
+  MOD_SUB_DIRS += smbfs
+  endif
 endif
 
-.c.s:
-	$(CC) $(CFLAGS) -S $<
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-.s.o:
-	$(AS) -o $*.o $<
+ifeq ($(CONFIG_NCP_FS),y)
+SUB_DIRS += ncpfs
+else
+  ifeq ($(CONFIG_NCP_FS),m)
+  MOD_SUB_DIRS += ncpfs
+  endif
+endif
 
-OBJS=	open.o read_write.o inode.o devices.o file_table.o buffer.o super.o \
-	block_dev.o stat.o exec.o pipe.o namei.o fcntl.o ioctl.o readdir.o \
-	select.o fifo.o locks.o filesystems.o dcache.o $(BINFMTS)
+ifeq ($(CONFIG_HPFS_FS),y)
+SUB_DIRS += hpfs
+else
+  ifeq ($(CONFIG_HPFS_FS),m)
+  MOD_SUB_DIRS += hpfs
+  endif
+endif
 
-all: fs.o filesystems.a
+ifeq ($(CONFIG_UFS_FS),y)
+SUB_DIRS += ufs
+else
+  ifeq ($(CONFIG_UFS_FS),m)
+  MOD_SUB_DIRS += ufs
+  endif
+endif
 
-fs.o: $(OBJS)
-	$(LD) -r -o fs.o $(OBJS)
+ifeq ($(CONFIG_AFFS_FS),y)
+SUB_DIRS += affs
+else
+  ifeq ($(CONFIG_AFFS_FS),m)
+  MOD_SUB_DIRS += affs
+  endif
+endif
 
-filesystems.a: dummy
-	rm -f filesystems.a
-	set -e; for i in $(FS_SUBDIRS); do \
-	  test ! -d $$i || \
-	    { $(MAKE) -C $$i; $(AR) rcs filesystems.a $$i/$$i.o; }; done
+ifeq ($(CONFIG_BINFMT_ELF),y)
+BINFMTS += binfmt_elf.o
+else
+  ifeq ($(CONFIG_BINFMT_ELF),m)
+  M_OBJS += binfmt_elf.o
+  endif
+endif
 
-modules: $(MODULE_OBJS)
-	for i in $(MODULE_FS_SUBDIRS); do $(MAKE) -C $$i modules; done
-	cd ../modules;for i in $(MODULE_OBJS); do ln -sf ../fs/$$i .; done
-	cd ../modules;for i in $(MODULE_FS_SUBDIRS); \
-	do echo $$i.o; ln -sf ../fs/$$i/$$i.o .; done > ../modules/FS_MODULES
+ifeq ($(CONFIG_BINFMT_AOUT),y)
+BINFMTS += binfmt_aout.o
+else
+  ifeq ($(CONFIG_BINFMT_AOUT),m)
+  M_OBJS += binfmt_aout.o
+  endif
+endif
 
-depend dep:
-	$(CPP) -M *.c > .depend
-	set -e; for i in $(FS_SUBDIRS); do \
-	  test ! -d $$i || $(MAKE) -C $$i dep; done
-	set -e; for i in $(MODULE_FS_SUBDIRS); do \
-	  test ! -d $$i || $(MAKE) -C $$i CFLAGS="$(CFLAGS) -DMODULE" dep; done
+ifeq ($(CONFIG_BINFMT_JAVA),y)
+BINFMTS += binfmt_java.o
+else
+  ifeq ($(CONFIG_BINFMT_JAVA),m)
+  M_OBJS += binfmt_java.o
+  endif
+endif
 
-dummy:
+# binfmt_script is always there
+BINFMTS += binfmt_script.o
 
-#
-# include a dependency file if one exists
-#
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
+include $(TOPDIR)/Rules.make