X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;ds=inline;f=direct%2Ftests%2FMakefile;h=b2b16a7e60bbf871477ac5d99da0d8e1cad65e95;hb=5587d9d89d5fb9c31fd723e85949f85da70ef3a9;hp=1389552b54f55fcd46e96da7b703557d059f431e;hpb=1570788072c1154eff93282e0bb8564de40bd8aa;p=yaffs2.git

diff --git a/direct/tests/Makefile b/direct/tests/Makefile
index 1389552..b2b16a7 100644
--- a/direct/tests/Makefile
+++ b/direct/tests/Makefile
@@ -18,7 +18,7 @@
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
+CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  -DCONFIG_YAFFS_DEFINES_TYPES
 CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
 CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
 #CFLAGS +=    -fno-strict-aliasing
@@ -33,7 +33,8 @@ CFLAGS +=    -Wextra -Wpointer-arith
 COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.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_nand.o \
+		 yaffs_tagscompat.o yaffs_tagsmarshall.o \
+		 yaffs_packedtags2.o yaffs_nand.o \
 		 yaffs_checkptrw.o  yaffs_qsort.o\
 		 yaffs_nameval.o yaffs_attribs.o \
 		 yaffs_norif1.o  ynorsim.o nor_stress.o yaffs_fsx.o \
@@ -51,8 +52,19 @@ YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_test.o
 
 ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
-          yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h  \
+YAFFSDIRECTSYMLINKS =  \
+          yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
+          yaffsfs.h yaffs_osglue.h ydirectenv.h \
+          yaffscfg.h yaffs_qsort.c \
+          yaffs_nandemul2k.h yaffs_list.h \
+          yaffs_attribs.c \
+          yaffs_nandif.c yaffs_nandif.h yportenv.h \
+          yaffs_hweight.c yaffs_hweight.h \
+          yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h \
+          yaffs_tagscompat.c yaffs_tagscompat.h \
+          yaffs_tagsmarshall.c yaffs_tagsmarshall.h \
+          yaffs_packedtags1.c yaffs_packedtags1.h \
+          yaffs_packedtags2.c yaffs_packedtags2.h  \
           yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \
           yaffs_checkptrw.h yaffs_checkptrw.c \
           yaffs_nameval.c yaffs_nameval.h \
@@ -64,22 +76,13 @@ YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscomp
           yaffs_verify.c yaffs_verify.h \
           yaffs_summary.c yaffs_summary.h
 
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h yaffs_osglue.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.c yaffs_hweight.h
-
 
 DIRECTEXTRASYMLINKS = 	yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
 			yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \
 			yaffs_ramdisk.c yaffs_ramdisk.h yaffs_ramem2k.c \
 			ynorsim.h ynorsim.c yaffs_osglue.c
 
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
-#all: directtest2k boottest
+COPIED_SOURCES = $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all: yaffs_test fuzzer
 
@@ -87,9 +90,6 @@ $(ALLOBJS): %.o: %.c
 	gcc -c $(CFLAGS) -o $@ $<
 
 
-$(YAFFSSYMLINKS):
-	ln -s ../../$@ $@
-
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
 
@@ -97,15 +97,11 @@ $(DIRECTEXTRASYMLINKS):
 	ln -s ../basic-test/$@ $@
 
 
-yaffs_test: $(SYMLINKS) $(YAFFSTESTOBJS)
+yaffs_test: $(COPIED_SOURCES) $(YAFFSTESTOBJS)
 	gcc $(CFLLAG) -o $@ $(YAFFSTESTOBJS)
 
 fuzzer: fuzzer.c
 	gcc $(CFLAGS) -o $@ $<
 
-
-
-
-
 clean:
-	rm -f yaffs_test fuzzer fuzzer.o $(ALLOBJS) core $(SYMLINKS)
+	rm -f yaffs_test fuzzer fuzzer.o $(ALLOBJS) core $(COPIED_SOURCES)