mtd/fs/jffs2 Makefile,1.34,1.35

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv29754

Modified Files:
	Makefile 
Log Message:
Build with 2.5 again. 2.5 doesn't include GNUmakefile though so it's not quite right yet.


Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile	8 Mar 2002 11:27:59 -0000	1.34
+++ Makefile	12 Nov 2002 09:43:28 -0000	1.35
@@ -10,21 +10,27 @@
 # 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 \
 	read.o nodemgmt.o readinode.o write.o scan.o gc.o \
 	symlink.o build.o erase.o background.o fs.o writev.o
 
-LINUX_OBJS-24	:= super-v24.o crc32.o
+LINUX_OBJS-24	:= super-v24.o crc32.o rbtree.o
 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)
+
+
+# 2.4 build compatibility
+obj-y := $(jffs2-objs)
+O_TARGET-24 := jffs2.o
+O_TARGET := $(O_TARGET-$(VERSION)$(PATCHLEVEL))
+#
 
 include $(TOPDIR)/Rules.make