X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2FMakefile;h=dcfc297b5b52b917510112668f4fecc4a5459720;hp=0f2b7ed11c66f70f310ab77394b6f85edd609dc7;hb=388ad45f27ef3288d2f1240a4e94d5849cf8201b;hpb=7f0f2c68474e11183cfbaebfd7c21ba48228f05e

diff --git a/direct/Makefile b/direct/Makefile
index 0f2b7ed..dcfc297 100644
--- a/direct/Makefile
+++ b/direct/Makefile
@@ -3,7 +3,7 @@
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #
-# Copyright (C) 2003 Aleph One Ltd.
+# Copyright (C) 2003-2010 Aleph One Ltd.
 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.23 2010-01-11 04:06:47 charles Exp $
+# $Id: Makefile,v 1.24 2010-02-17 02:18:57 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -28,48 +28,53 @@ CFLAGS +=    -O0
 #CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
-
 COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
 		 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
 		 yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \
 		 yaffs_checkptrw.o  yaffs_qsort.o\
-		 yaffs_norif1.o  ynorsim.o
-#		 yaffs_checkptrwtest.o\
+		 yaffs_nameval.o \
+		 yaffs_norif1.o  ynorsim.o nor_stress.o yaffs_fsx.o \
+		 yaffs_allocator.o \
+		 yaffs_bitmap.o \
+		 yaffs_yaffs1.o \
+		 yaffs_yaffs2.o \
+		 yaffs_verify.o
 
-DIRECTTESTOBJS = $(COMMONTESTOBJS) dtest.o
+#		 yaffs_checkptrwtest.o\
 
-BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.o
+YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_test.o
 
-#ALLOBJS =  dtest.o nand_ecc.o yaffscfg.o yaffs_fileem.o yaffsfs.o yaffs_ramdisk.o bootldtst.o yboot.o yaffs_ramem2k.o
 
-ALLOBJS = $(sort $(DIRECTTESTOBJS) $(YAFFSTESTOBJS))
+ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-SYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \
+YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \
           yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h  yaffs_nandemul2k.h \
-          yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \
+          yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h yaffs_list.h \
           yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
-          yaffs_qsort.c yaffs_qsort.h yaffs_trace.h
+          yaffs_nameval.c yaffs_nameval.h \
+          yaffs_qsort.c yaffs_qsort.h yaffs_trace.h \
+          yaffs_allocator.c yaffs_allocator.h \
+          yaffs_yaffs1.c yaffs_yaffs1.h \
+          yaffs_yaffs2.c yaffs_yaffs2.h \
+          yaffs_bitmap.c yaffs_bitmap.h \
+          yaffs_verify.c yaffs_verify.h
 
-#all: directtest2k boottest
 
-all: directtest2k
+SYMLINKS = $(YAFFSSYMLINKS)
 
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
 
-$(SYMLINKS):
-	ln -s ../$@ $@
 
-directtest2k: $(SYMLINKS) $(DIRECTTESTOBJS)
-	gcc -o $@ $(DIRECTTESTOBJS)
 
-yaffs_test: $(SYMLINKS) $(YAFFSTESTOBJS)
-	gcc -o $@ $(YAFFSTESTOBJS)
 
+symlinks: $(SYMLINKS)
 
-boottest: $(SYMLINKS) $(BOOTTESTOBJS)
-	gcc -o $@ $(BOOTTESTOBJS)
+
+$(YAFFSSYMLINKS):
+	ln -s ../$@ $@
+
+$(YAFFSDIRECTSYMLINKS):
+	ln -s ../$@ $@
 
 
 clean:
-	rm -f $(ALLOBJS) core
+	rm -f $(SYMLINKS)