X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=Makefile;h=c82fdbda1e0266fe6fb2ce1522c6319b4ea0baa4;hp=f261d2017c5a7790bb3074040276cdc252a60c78;hb=5bc32d099123b2e0e5f27f7421caa5413d3211f0;hpb=780469359d1051ab37ab281b0520137d73fee2e9

diff --git a/Makefile b/Makefile
index f261d20..c82fdbd 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,22 +15,47 @@
 # 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
+	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_fs.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_endian.o
+	yaffs2-objs += yaffs_summary.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
+	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 yaffs_attribs.o
+	yaffs2multi-objs += yaffs_yaffs1.o
+	yaffs2multi-objs += yaffs_yaffs2.o
+	yaffs2multi-objs += yaffs_verify.o
+	yaffs2multi-objs += yaffs_endian.o
+	yaffs2multi-objs += yaffs_summary.o
 
 else
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build