X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftests%2FMakefile;h=072944a2e845be731da97578c0258e2da4a31ea1;hp=495473b58b8a37c72bc24072752fc17f32818644;hb=8b348464b712730cbc18391924d805c1cab7b9ff;hpb=2369fadda0bee21c2ddb7a7596be7a5df578757e

diff --git a/direct/tests/Makefile b/direct/tests/Makefile
index 495473b..072944a 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
@@ -51,8 +51,18 @@ YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_test.o
 
 ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-YAFFSSOURCEFILES = 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 \
+          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 \
+          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  \
           yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \
           yaffs_checkptrw.h yaffs_checkptrw.c \
           yaffs_nameval.c yaffs_nameval.h \
@@ -64,22 +74,13 @@ YAFFSSOURCEFILES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagsc
           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
 
-COPIED_SOURCES = $(YAFFSSOURCEFILES) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
-#all: directtest2k boottest
+COPIED_SOURCES = $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all: yaffs_test fuzzer
 
@@ -87,15 +88,6 @@ $(ALLOBJS): %.o: %.c
 	gcc -c $(CFLAGS) -o $@ $<
 
 
-$(YAFFSSOURCEFILES):
-	sed ../../$@ \
-	-e "s/strcat/yaffs_strcat/g" \
-	-e "s/strcpy/yaffs_strcpy/g" \
-	-e "s/strncpy/yaffs_strncpy/g" \
-	-e "s/strnlen/yaffs_strnlen/g" \
-	-e "s/strcmp/yaffs_strcmp/g" \
-	-e "s/strncmp/yaffs_strncmp/g" >$@
-
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
 
@@ -109,9 +101,5 @@ yaffs_test: $(COPIED_SOURCES) $(YAFFSTESTOBJS)
 fuzzer: fuzzer.c
 	gcc $(CFLAGS) -o $@ $<
 
-
-
-
-
 clean:
 	rm -f yaffs_test fuzzer fuzzer.o $(ALLOBJS) core $(COPIED_SOURCES)