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

diff --git a/direct/python/Makefile b/direct/python/Makefile
index 8376725..c428732 100644
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -18,41 +18,45 @@
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DCONFIG_YAFFS_YAFFS2  
+CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
 CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES -DNO_Y_INLINE
 CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
 #CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
+CFLAGS +=    -O0 -fPIC
 #CFLAGS +=    -DVALGRIND_TEST
 
 #CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
 
-COMMONTESTOBJS = yaffscfg2k.o yramsim.o yaffs_fileem2k.o\
-		 yaffs_nandif.o \
+COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\
+		 yramsim.o yaffs_fileem2k.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
 
 
 
-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_list.h \
-          yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.h \
-          yaffs_qsort.c yaffs_qsort.h yaffs_trace.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_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 \
           yaffs_yaffs1.c yaffs_yaffs1.h \
           yaffs_yaffs2.c yaffs_yaffs2.h \
@@ -60,17 +64,20 @@ YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h ya
           yaffs_verify.c yaffs_verify.h
           
 
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffsfs.h yaffscfg.h yaffs_malloc.h ydirectenv.h \
-		       yaffs_flashif.c yaffs_flashif.h\
-		       yaffs_nandif.c yaffs_nandif.h
+YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffsfs.h yaffscfg.h yaffs_osglue.h  ydirectenv.h \
+		       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_error.c
 
 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 \
                         yaffsnewcfg.c yramsim.c yramsim.h \
-                        ynorsim.h ynorsim.c
+                        ynorsim.h ynorsim.c yaffs_osglue.c
                                                                         
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
+ALL_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all:  libyaffsfs.so
 
@@ -78,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 ../$@ $@
@@ -89,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