X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2FMakefile;h=026c0b83c55297de59a4be9c8f9bb5b1c948cfe0;hp=1761ac449d248deae0c08074347db3914594d236;hb=e61569df5e4cdd90d529d312fa9fb317f726e224;hpb=2369fadda0bee21c2ddb7a7596be7a5df578757e

diff --git a/direct/basic-test/Makefile b/direct/basic-test/Makefile
index 1761ac4..026c0b8 100644
--- a/direct/basic-test/Makefile
+++ b/direct/basic-test/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 -D CONFIG_YAFFS_DEFINES_TYPES
 CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES -DNO_Y_INLINE
 CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Werror=strict-aliasing 
 #CFLAGS +=    -fno-strict-aliasing
@@ -51,7 +51,9 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \
 #		 yaffs_checkptrwtest.o\
 
 
-YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
+YAFFSDIRECTSYMLINKS = \
+          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 \
@@ -62,18 +64,14 @@ YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscomp
           yaffs_yaffs2.c yaffs_yaffs2.h \
           yaffs_bitmap.c yaffs_bitmap.h \
           yaffs_verify.c yaffs_verify.h \
-          yaffs_summary.c yaffs_summary.h
+          yaffs_summary.c yaffs_summary.h \
+	  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
+          yaffsfs.h yaffs_osglue.h ydirectenv.h \
+          yaffscfg.h yaffs_list.h \
+          yaffs_qsort.c yportenv.h yaffs_attribs.c \
+          yaffs_nandif.c yaffs_nandif.h yaffs_nandemul2k.h \
+          yaffs_hweight.h yaffs_hweight.c \
 
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h yaffs_osglue.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_list.h \
-		       yaffs_qsort.c yportenv.h yaffs_attribs.c \
-		       yaffs_nandif.c yaffs_nandif.h yaffs_nandemul2k.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-
-
-
-COPIED_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS)
 
 
 DIRECTTESTOBJS = $(COMMONTESTOBJS) dtest.o
@@ -90,32 +88,20 @@ $(ALLOBJS): %.o: %.c
 	gcc -c $(CFLAGS) -o $@ $<
 
 
-$(YAFFS_SOURCES):
-	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" >$@
-                                                        
-$(YAFFSSYMLINKS):
-	ln -s ../../$@ $@
-
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
 
 
-directtest2k: $(COPIED_SOURCES) $(DIRECTTESTOBJS)
+directtest2k: $(YAFFSDIRECTSYMLINKS) $(DIRECTTESTOBJS)
 	gcc -o $@ $(DIRECTTESTOBJS)
 
-yaffs_test: $(COPIED_SOURCES) $(YAFFSTESTOBJS)
+yaffs_test: $(YAFFSDIRECTSYMLINKS) $(YAFFSTESTOBJS)
 	gcc -o $@ $(YAFFSTESTOBJS)
 
 
-boottest: $(COPIED_SOURCES) $(BOOTTESTOBJS)
+boottest: $(YAFFSDIRECTSYMLINKS) $(BOOTTESTOBJS)
 	gcc -o $@ $(BOOTTESTOBJS)
 
 
 clean:
-	rm -f $(TARGETS) $(ALLOBJS) core core $(COPIED_SOURCES)
+	rm -f $(TARGETS) $(ALLOBJS) core $(YAFFSDIRECTSYMLINKS)