patch-2.4.11-dontuse linux/fs/jffs/Makefile

• Lines: 48
• Date: Thu Oct 4 15:13:18 2001
• Orig file: v2.4.10/linux/fs/jffs/Makefile
• Orig date: Fri Dec 29 14:07:23 2000

diff -u --recursive --new-file v2.4.10/linux/fs/jffs/Makefile linux/fs/jffs/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the linux Journalling Flash FileSystem (JFFS) routines.
 #
-# $Id: Makefile,v 1.7 2000/08/04 12:46:34 dwmw2 Exp $
+# $Id: Makefile,v 1.11 2001/09/25 20:59:41 dwmw2 Exp $
 #
 # Note! Dependencies are done automagically by 'make dep', which also
 # removes any old dependencies. DON'T put your own dependencies here
@@ -9,28 +9,24 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-ifndef CONFIG_JFFS_FS
+list-multi := jffs.o
 
-# We're being invoked outside a normal kernel build. Fake it
-EXTRA_CFLAGS= -I$(shell pwd)/../../include
-
-# You need to change this to build for 2.2, dunno how to check for it.
-
-#INODE_O := inode-v22.o
-INODE_O := inode-v23.o
-
-else
+jffs-objs := jffs_fm.o intrep.o
 
 ifeq ($(PATCHLEVEL),2)
-	INODE_O := inode-v22.o
+	jffs-objs += inode-v22.o
 else
-	INODE_O := inode-v23.o
+	jffs-objs += inode-v23.o
 endif
 
+ifeq ($(CONFIG_JFFS_PROC_FS),y)
+	jffs-objs += jffs_proc.o
 endif
 
 O_TARGET := jffs.o
-obj-m    := $(O_TARGET)
-obj-y    := jffs_fm.o intrep.o $(INODE_O)
+
+obj-y := $(jffs-objs)
+obj-m := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make
+