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

diff --git a/Makefile b/Makefile
index db1b5c2..a346458 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@
 
 ifdef YAFFS_CURRENT
 	YAFFS_O := yaffs2.o
+	EXTRA_CFLAGS += -DYAFFS_CURRENT
 else
 	YAFFS_O := yaffs2multi.o
 endif
@@ -26,11 +27,12 @@ ifneq ($(KERNELRELEASE),)
 
 	obj-m := $(YAFFS_O)
 
-	yaffs2-objs := yaffs_mtdif.o yaffs_mtdif2_single.o
-	yaffs2-objs += yaffs_mtdif1_single.o yaffs_packedtags1.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
+	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 yaffs_attribs.o
@@ -39,11 +41,12 @@ ifneq ($(KERNELRELEASE),)
 	yaffs2-objs += yaffs_verify.o
 	yaffs2-objs += yaffs_summary.o
 
-	yaffs2multi-objs := yaffs_mtdif.o yaffs_mtdif2_multi.o
-	yaffs2multi-objs += yaffs_mtdif1_multi.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
+	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