X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fpython%2FMakefile;h=7c7a063120874e518d473d0e33e9285f691599d6;hp=5f24f97eeaab6d838c5243fa4e667655d14ac0a0;hb=c118b37070fa47650ca61c8c740da7461450d139;hpb=7282db97a2cb76223c8181c5a8476da9fc2f1a6e

diff --git a/direct/python/Makefile b/direct/python/Makefile
index 5f24f97..7c7a063 100644
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -3,7 +3,7 @@
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #
-# Copyright (C) 2003 Aleph One Ltd.
+# Copyright (C) 2003-2010 Aleph One Ltd.
 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.2 2009-10-08 23:11:12 charles Exp $
+# $Id: Makefile,v 1.6 2010-02-17 00:51:15 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -22,57 +22,62 @@ CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DCONFIG_Y
 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 yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
+COMMONTESTOBJS = yaffscfg2k.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_checkptrw.o  yaffs_qsort.o\
-		 yaffs_norif1.o  ynorsim.o
+		 yaffs_nameval.o \
+		 yaffs_allocator.o \
+		 yaffs_norif1.o  ynorsim.o \
+		 yaffs_bitmap.o \
+		 yaffs_verify.o \
+		 yaffs_yaffs1.o yaffs_yaffs2.o 
 
 
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_wrap.o yaffs_swig_helper.o
+YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o yaffs_error_converter.o
 
 
-ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-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 \
+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  \
+          yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h  \
           yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
-          yaffs_qsort.c yaffs_qsort.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 \
+          yaffs_bitmap.c yaffs_bitmap.h \
+          yaffs_verify.c yaffs_verify.h
+          
 
-YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffs_fileem2k.h yaffsfs.h yaffs_malloc.h yaffs_ramdisk.h ydirectenv.h \
-		       yaffscfg.h yaffs_fileem.c yaffs_flashif.c yaffs_ramdisk.c yaffs_ramem2k.c\
-		       yaffs_norif1.c yaffs_norif1.h ynorsim.c ynorsim.h \
-		       yaffs_nandif.c yaffs_nandif.h
+YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffsfs.h yaffscfg.h yaffs_malloc.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
 
+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
+                                                                        
+SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
+all:  libyaffsfs.so
 
-all: _yaffs.so
 
-yaffs_wrap.c: yaffs.i yaffsfs_for_swig.h
-	swig -python yaffs.i
-
-yaffsfs_for_swig.h: yaffsfs.h
-	cat yaffsfs.h | \
-	sed -e "s/YCHAR/char/g" | \
-	sed -e "s/YUCHAR/unsigned char/g" | \
-	sed -e "s/void \*/char \*/g" | \
-	sed -e "s/loff_t/long long/g" | \
-	sed -e "s/off_t/long/g" | \
-	sed -e "s/struct yaffs_stat/struct yaffs_stat_struct/g" \
-	> $@
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -I/usr/include/python2.6/  -o $@ $<
+$(YAFFSLIBOBJS): %.o: %.c
+	gcc -c $(CFLAGS)   -o $@ $<
 
 
 $(YAFFSSYMLINKS):
@@ -81,15 +86,17 @@ $(YAFFSSYMLINKS):
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
 
+$(DIRECTEXTRASYMLINKS):
+	ln -s ../basic-test/$@ $@
 
 
-_yaffs.so: $(SYMLINKS) yaffs_wrap.c $(ALLOBJS)
-	gcc -shared $(ALLOBJS) -o $@
+libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
+	gcc -shared $(YAFFSLIBOBJS) -o $@
 
 
 
 
 clean:
-	rm -f _yaffs.so yaffs.py yaffs.pyc yaffs_wrap.c $(ALLOBJS) core $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
-	rm -f *.c.*
-	rm -f yaffsfs_for_swig.h
+	rm -f  $(YAFFSLIBOBJS)  core $(SYMLINKS)
+	rm -f libyaffsfs.so
+	rm -f *.pyc