X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fpython%2FMakefile;h=c428732b495028acf1f6d1bc44be0c85e3e9601b;hp=6e0c5fd0baa6a21f029896ef10c7d55891858b7e;hb=6ee253300224f1f146931cf7822f57059f600f4b;hpb=fcc9631a249a467718a7ae67c58ae1ab29e5d034

diff --git a/direct/python/Makefile b/direct/python/Makefile
index 6e0c5fd..c428732 100644
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -34,24 +34,27 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\
 		 yaffs_nandif.o yaffs_attribs.o \
 		 yaffsfs.o  yaffs_ecc.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_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \
 		 yaffs_checkptrw.o  yaffs_qsort.o\
 		 yaffs_nameval.o \
+		 yaffs_summary.o \
 		 yaffs_allocator.o \
 		 yaffs_norif1.o  ynorsim.o \
 		 yaffs_bitmap.o \
 		 yaffs_verify.o \
-		 yaffs_yaffs1.o yaffs_yaffs2.o 
+		 yaffs_yaffs1.o yaffs_yaffs2.o \
+		 yaffs_error.o
 
 
-YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o yaffs_error_converter.o
+YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
 
 
 
-YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
+YAFFS_SOURCES = 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_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
+          yaffs_checkptrw.h yaffs_checkptrw.c \
+          yaffs_summary.c yaffs_summary.h \
           yaffs_nameval.c yaffs_nameval.h yaffs_attribs.h \
           yaffs_trace.h \
           yaffs_allocator.c yaffs_allocator.h \
@@ -65,7 +68,8 @@ YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffsfs.h yaffscfg.h yaffs_osglue.h  ydirectenv
 		       yaffs_flashif.c yaffs_flashif.h yaffs_flashif2.h yaffs_list.h \
 		       yaffs_nandif.c yaffs_nandif.h yaffs_qsort.c yaffs_nandemul2k.h \
 		       yportenv.h yaffs_attribs.c \
-		       yaffs_hweight.c yaffs_hweight.h
+		       yaffs_hweight.c yaffs_hweight.h \
+		       yaffs_error.c
 
 DIRECTEXTRASYMLINKS =   yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                         yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \
@@ -73,7 +77,7 @@ DIRECTEXTRASYMLINKS =   yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                         yaffsnewcfg.c yramsim.c yramsim.h \
                         ynorsim.h ynorsim.c yaffs_osglue.c
                                                                         
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
+ALL_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all:  libyaffsfs.so
 
@@ -81,9 +85,15 @@ all:  libyaffsfs.so
 $(YAFFSLIBOBJS): %.o: %.c
 	gcc -c $(CFLAGS)   -o $@ $<
 
-
-$(YAFFSSYMLINKS):
-	ln -s ../../$@ $@
+$(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" >$@
+							
 
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
@@ -92,13 +102,13 @@ $(DIRECTEXTRASYMLINKS):
 	ln -s ../basic-test/$@ $@
 
 
-libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
+libyaffsfs.so: $(ALL_SOURCES) $(YAFFSLIBOBJS)
 	gcc -shared $(YAFFSLIBOBJS) -o $@
 
 
 
 
 clean:
-	rm -f  $(YAFFSLIBOBJS)  core $(SYMLINKS)
+	rm -f  $(YAFFSLIBOBJS)  core $(ALL_SOURCES)
 	rm -f libyaffsfs.so
 	rm -f *.pyc