X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2FMakefile;fp=direct%2FMakefile;h=d8ddd326f317300e3413c0396b7cf17d463ec0d6;hp=931fed14dc9027538594a30da9fc3c0cfcb82a67;hb=4a700fe570d217c2c5df87070db7c2652bc0eaaf;hpb=25f6e492e7010f585367a4f6abf4d2e17c5c0e1a

diff --git a/direct/Makefile b/direct/basic-test/Makefile
similarity index 65%
rename from direct/Makefile
rename to direct/basic-test/Makefile
index 931fed1..d8ddd32 100644
--- a/direct/Makefile
+++ b/direct/basic-test/Makefile
@@ -28,49 +28,83 @@ 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_nameval.o \
-		 yaffs_norif1.o  ynorsim.o \
-		 yaffs_allocator.o yaffs_yaffs1.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_bitmap.o yaffs_verify.o
+		 yaffs_verify.o
 
 #		 yaffs_checkptrwtest.o\
 
-DIRECTTESTOBJS = $(COMMONTESTOBJS) dtest.o
+YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_test.o
 
-BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.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_nameval.h yaffs_nameval.c \
+          yaffs_nameval.c yaffs_nameval.h \
           yaffs_qsort.c yaffs_qsort.h yaffs_trace.h \
           yaffs_allocator.c yaffs_allocator.h \
-	  yaffs_bitmap.c yaffs_bitmap.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
+YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
+		       yaffsfs.h yaffs_malloc.h ydirectenv.h \
+		       yaffs_flashif.c \
+		       yaffs_nandif.c yaffs_nandif.h
+
 
-all: directtest2k
+
+SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
+
+
+
+
+COMMONTESTOBJS = yaffsnewcfg.o  yramsim.o \
+		 yaffsfs.o yaffs_guts.o yaffs_ecc.o yaffs_nandif.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_nameval.o \
+		 yaffs_norif1.o  ynorsim.o \
+		 yaffs_allocator.o yaffs_yaffs1.o \
+		 yaffs_yaffs2.o \
+		 yaffs_bitmap.o yaffs_verify.o
+
+#		 yaffs_checkptrwtest.o\
+
+DIRECTTESTOBJS = $(COMMONTESTOBJS) dtest.o
+
+BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.o
+
+ALLOBJS = $(sort $(DIRECTTESTOBJS) $(YAFFSTESTOBJS))
+
+TARGETS = directtest2k
+
+all: $(TARGETS)
 
 $(ALLOBJS): %.o: %.c
 	gcc -c $(CFLAGS) -o $@ $<
 
-$(SYMLINKS):
+
+$(YAFFSSYMLINKS):
+	ln -s ../../$@ $@
+
+$(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
 
+
 directtest2k: $(SYMLINKS) $(DIRECTTESTOBJS)
 	gcc -o $@ $(DIRECTTESTOBJS)
 
@@ -83,4 +117,4 @@ boottest: $(SYMLINKS) $(BOOTTESTOBJS)
 
 
 clean:
-	rm -f $(ALLOBJS) core core $(SYMLINKS)
+	rm -f $(TARGETS) $(ALLOBJS) core core $(SYMLINKS)