mtd/fs/jffs2 Makefile,1.35,1.36

[gleixner at infradead.org]

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

Modified Files:
	Makefile 
Log Message:
2.2/2.4/2.5 aware Makefile, even if current CVS does not coompile with 2.5

Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile	12 Nov 2002 09:43:28 -0000	1.35
+++ Makefile	27 Nov 2002 10:45:09 -0000	1.36
@@ -17,20 +17,25 @@
 	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 rbtree.o
-LINUX_OBJS-25	:= super.o
+BELOW25		:= $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
+
+ifeq ($(BELOW25),y)
+LINUX_OBJS	:= super-v24.o crc32.o rbtree.o
+else
+LINUX_OBJS	:= super.o
+endif
 
 NAND_OBJS-$(CONFIG_JFFS2_FS_NAND)	:= wbuf.o
 
 jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
-	$(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
+	$(LINUX_OBJS)
 
 
 # 2.4 build compatibility
+ifeq ($(BELOW25),y)
 obj-y := $(jffs2-objs)
-O_TARGET-24 := jffs2.o
-O_TARGET := $(O_TARGET-$(VERSION)$(PATCHLEVEL))
-#
+O_TARGET := jffs2.o
+endif
 
 include $(TOPDIR)/Rules.make