X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=Makefile;h=a34645895253a0555b3053923ed7bd8b80ded1ee;hp=0192d08b89322fd8aecd25a4aede20b3f9e41a14;hb=52df965f345821f60e6d9943cada6080beb5fef0;hpb=1996f7866c793b99020d2d204d522291609e9fbb

diff --git a/Makefile b/Makefile
index 0192d08..a346458 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
-# Main Makefile for out-of-tree yaffs2.ko building
+# Main Makefile for out-of-tree yaffs2 .ko building
 #
+# You can make two flavours of the .ko
+#  make YAFFS_CURRENT=1  : makes yaffs2.ko using the current version code
+#  make                  : makes yaffs2multi.ko using the multi-version code
 #
 # YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
 #
@@ -12,35 +15,45 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
+ifdef YAFFS_CURRENT
+	YAFFS_O := yaffs2.o
+	EXTRA_CFLAGS += -DYAFFS_CURRENT
+else
+	YAFFS_O := yaffs2multi.o
+endif
 
 ifneq ($(KERNELRELEASE),)
 	EXTRA_CFLAGS += -DYAFFS_OUT_OF_TREE
 
-	obj-m := yaffs2.o yaffs2multi.o
+	obj-m := $(YAFFS_O)
 
-	yaffs2-objs := yaffs_mtdif.o yaffs_mtdif2.o
-	yaffs2-objs += yaffs_mtdif1.o yaffs_packedtags1.o
-	yaffs2-objs += yaffs_ecc.o yaffs_vfs.o yaffs_guts.o
+	yaffs2-objs := yaffs_mtdif_single.o
+	yaffs2-objs += yaffs_packedtags1.o
+	yaffs2-objs += yaffs_ecc.o yaffs_vfs_single.o yaffs_guts.o
 	yaffs2-objs += yaffs_packedtags2.o
-	yaffs2-objs += yaffs_tagscompat.o yaffs_tagsvalidity.o
+	yaffs2-objs += yaffs_tagscompat.o
+	yaffs2-objs += yaffs_tagsmarshall.o
 	yaffs2-objs += yaffs_checkptrw.o yaffs_nand.o
 	yaffs2-objs += yaffs_checkptrw.o yaffs_nand.o yaffs_nameval.o
-	yaffs2-objs += yaffs_allocator.o yaffs_bitmap.o
+	yaffs2-objs += yaffs_allocator.o yaffs_bitmap.o yaffs_attribs.o
 	yaffs2-objs += yaffs_yaffs1.o
 	yaffs2-objs += yaffs_yaffs2.o
 	yaffs2-objs += yaffs_verify.o
+	yaffs2-objs += yaffs_summary.o
 
-	yaffs2multi-objs := yaffs_mtdif.o yaffs_mtdif2.o
-	yaffs2multi-objs += yaffs_mtdif1.o yaffs_packedtags1.o
+	yaffs2multi-objs := yaffs_mtdif_multi.o
+	yaffs2multi-objs += yaffs_packedtags1.o
 	yaffs2multi-objs += yaffs_ecc.o yaffs_vfs_multi.o yaffs_guts.o
 	yaffs2multi-objs += yaffs_packedtags2.o
-	yaffs2multi-objs += yaffs_tagscompat.o yaffs_tagsvalidity.o
+	yaffs2multi-objs += yaffs_tagscompat.o
+	yaffs2multi-objs += yaffs_tagsmarshall.o
 	yaffs2multi-objs += yaffs_checkptrw.o yaffs_nand.o
 	yaffs2multi-objs += yaffs_checkptrw.o yaffs_nand.o yaffs_nameval.o
-	yaffs2multi-objs += yaffs_allocator.o yaffs_bitmap.o
+	yaffs2multi-objs += yaffs_allocator.o yaffs_bitmap.o yaffs_attribs.o
 	yaffs2multi-objs += yaffs_yaffs1.o
 	yaffs2multi-objs += yaffs_yaffs2.o
 	yaffs2multi-objs += yaffs_verify.o
+	yaffs2multi-objs += yaffs_summary.o
 
 else
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build