mtd/drivers/mtd Makefile,1.67,1.68

[gleixner at infradead.org]

Update of /home/cvs/mtd/drivers/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv19354

Modified Files:
	Makefile 
Log Message:
2.2/2.4/2.5 aware Makefile

Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/Makefile,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Makefile	15 Nov 2002 02:15:58 -0000	1.67
+++ Makefile	27 Nov 2002 10:35:08 -0000	1.68
@@ -10,7 +10,14 @@
 #
 # $Id$
 
+export-objs	:= mtdcore.o mtdpart.o redboot.o cmdlinepart.o afs.o mtdconcat.o
+
+nftl-objs	:= nftlcore.o nftlmount.o
+mtdblock-objs	:= mtdblock-core.o
 
+BELOW25		:= $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
+
+ifeq ($(BELOW25),y)
 obj-y           += chips/chipslink.o maps/mapslink.o \
 			devices/devlink.o nand/nandlink.o
 obj-m           :=
@@ -19,12 +26,16 @@
 
 O_TARGET	:= mtdlink.o
 
-export-objs	:= mtdcore.o mtdpart.o redboot.o cmdlinepart.o afs.o mtdconcat.o
-list-multi	:= nftl.o
+list-multi	:= nftl.o mtdblock.o
 
 mod-subdirs	:= 
 subdir-y	:= chips maps devices nand
 subdir-m	:= $(subdir-y)
+mtdblock-objs	+= mtdblock-24.o
+else
+obj-y           += chips/ maps/ devices/ nand/
+mtdblock-objs	+= mtdblock-25.o
+endif
 
 #                       *** BIG UGLY NOTE ***
 #
@@ -57,10 +68,14 @@
 obj-$(CONFIG_FTL)		+= ftl.o
 obj-$(CONFIG_NFTL)		+= nftl.o
 
-nftl-objs	:= nftlcore.o nftlmount.o
 
 include $(TOPDIR)/Rules.make
 
+# below 2.5 only
+ifeq ($(BELOW25),y)
 nftl.o: $(nftl-objs)
 	$(LD) -r -o $@ $(nftl-objs)
 
+mtdblock.o: $(mtdblock-objs)
+	$(LD) -r -o $@ $(mtdblock-objs)
+endif