patch-2.3.35 linux/fs/Makefile

• Lines: 87
• Date: Mon Dec 27 17:30:02 1999
• Orig file: v2.3.34/linux/fs/Makefile
• Orig date: Tue Nov 23 22:42:21 1999

diff -u --recursive --new-file v2.3.34/linux/fs/Makefile linux/fs/Makefile
@@ -7,18 +7,18 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile.
 
-L_TARGET := filesystems.a
-L_OBJS    = $(join $(SUB_DIRS),$(SUB_DIRS:%=/%.o))
+FILESYSTEMS = $(join $(SUB_DIRS),$(SUB_DIRS:%=/%.o))
 O_TARGET := fs.o
 O_OBJS    = open.o read_write.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 inode.o attr.o bad_inode.o file.o iobuf.o $(BINFMTS) 
+		dcache.o inode.o attr.o bad_inode.o file.o iobuf.o \
+		$(BINFMTS) $(FILESYSTEMS)
 
 MOD_LIST_NAME := FS_MODULES
 ALL_SUB_DIRS = coda minix ext2 fat msdos vfat proc isofs nfs umsdos ntfs \
 		hpfs sysv smbfs ncpfs ufs efs affs romfs autofs hfs lockd \
-		nfsd nls devpts adfs partitions qnx4 udf bfs
+		nfsd nls devpts adfs partitions qnx4 udf bfs cramfs openpromfs
 
 SUB_DIRS := partitions
 
@@ -28,6 +28,22 @@
 O_OBJS += noquot.o
 endif
 
+ifeq ($(CONFIG_EXT2_FS),y)
+SUB_DIRS += ext2
+else
+  ifeq ($(CONFIG_EXT2_FS),m)
+  MOD_SUB_DIRS += ext2
+  endif
+endif
+
+ifeq ($(CONFIG_CRAMFS),y)
+SUB_DIRS += cramfs
+else
+  ifeq ($(CONFIG_CRAMFS),m)
+  MOD_SUB_DIRS += cramfs
+  endif
+endif
+
 ifeq ($(CONFIG_CODA_FS),y)
 SUB_DIRS += coda
 else
@@ -44,14 +60,6 @@
   endif
 endif
 
-ifeq ($(CONFIG_EXT2_FS),y)
-SUB_DIRS += ext2
-else
-  ifeq ($(CONFIG_EXT2_FS),m)
-  MOD_SUB_DIRS += ext2
-  endif
-endif
-
 ifeq ($(CONFIG_FAT_FS),y)
 SUB_DIRS += fat
 else
@@ -78,10 +86,6 @@
 
 ifdef CONFIG_PROC_FS
 SUB_DIRS += proc
-ifeq ($(CONFIG_SUN_OPENPROMFS),m)
-MOD_IN_SUB_DIRS += proc
-MOD_TO_LIST += openpromfs.o
-endif
 endif
 
 ifeq ($(CONFIG_BFS_FS),y)
@@ -262,6 +266,14 @@
 else
   ifeq ($(CONFIG_DEVPTS_FS),m)
   MOD_SUB_DIRS += devpts
+  endif
+endif
+
+ifeq ($(CONFIG_SUN_OPENPROMFS),y)
+SUB_DIRS += openpromfs
+else
+  ifeq ($(CONFIG_SUN_OPENPROMFS),m)
+  MOD_SUB_DIRS += openpromfs
   endif
 endif