VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / fs / jffs2 / Makefile

diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index de0e418..27eaa6a 100644 (file)
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -1,21 +1,17 @@
 #
-# Makefile for the linux Journalling Flash FileSystem (JFFS) routines.
+# Makefile for the Linux Journalling Flash File System v2 (JFFS2)
 #
-# $Id: Makefile,v 1.34 2002/03/08 11:27:59 dwmw2 Exp $
+# $Id: Makefile.common,v 1.6 2004/07/16 15:17:57 dwmw2 Exp $
 #
 
 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 \
-       read.o nodemgmt.o readinode.o write.o scan.o gc.o \
-       symlink.o build.o erase.o background.o fs.o writev.o
+jffs2-y        := compr.o dir.o file.o ioctl.o nodelist.o malloc.o
+jffs2-y        += read.o nodemgmt.o readinode.o write.o scan.o gc.o
+jffs2-y        += symlink.o build.o erase.o background.o fs.o writev.o
+jffs2-y        += super.o
 
-LINUX_OBJS-24  := super-v24.o crc32.o
-LINUX_OBJS-25  := super.o
-LINUX_OBJS-26  := super.o
-
-NAND_OBJS-$(CONFIG_JFFS2_FS_NAND)      := wbuf.o
-
-jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
-             $(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
+jffs2-$(CONFIG_JFFS2_FS_NAND)  += wbuf.o
+jffs2-$(CONFIG_JFFS2_RUBIN)    += compr_rubin.o
+jffs2-$(CONFIG_JFFS2_RTIME)    += compr_rtime.o
+jffs2-$(CONFIG_JFFS2_ZLIB)     += compr_zlib.o