X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fpython%2FMakefile;h=c420a3c2a63debeffe1f886f4142a740a2359ecf;hp=f5ca02c4d90dd8a4f946ecc26c22e7b0d69b0ec3;hb=29e2dccbc8145ce3fd337a91a266d29e9b0f3f60;hpb=a6f6a1bb6ff2b876047173be7cec28a1e1faaaa4

diff --git a/direct/python/Makefile b/direct/python/Makefile
index f5ca02c..c420a3c 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.3 2009-10-09 06:12:26 charles Exp $
+# $Id: Makefile,v 1.6 2010-02-17 00:51:15 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -33,10 +33,10 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
 		 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_nameval.o \
 		 yaffs_norif1.o  ynorsim.o
 
 
-YAFFSSWIGOBJS  = $(COMMONTESTOBJS) yaffs_wrap.o yaffs_python_helper.o
 YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
 
 
@@ -45,7 +45,9 @@ YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h ya
           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_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
-          yaffs_qsort.c yaffs_qsort.h
+          yaffs_nameval.c yaffs_nameval.h \
+          yaffs_qsort.c yaffs_qsort.h yaffs_trace.h \
+          yaffs_allocator.c yaffs_allocator.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 \
@@ -56,27 +58,12 @@ YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h y
 
 SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
 
-all: _yaffs.so libyaffsfs.so
+all:  libyaffsfs.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" \
-	> $@
 
 $(YAFFSLIBOBJS): %.o: %.c
 	gcc -c $(CFLAGS)   -o $@ $<
 
-yaffs_wrap.o:  %.o: %.c
-	gcc -c $(CFLAGS) -I/usr/include/python2.6/  -o $@ $<
-
 
 $(YAFFSSYMLINKS):
 	ln -s ../../$@ $@
@@ -86,9 +73,6 @@ $(YAFFSDIRECTSYMLINKS):
 
 
 
-_yaffs.so: $(SYMLINKS) yaffs_wrap.c $(YAFFSSWIGOBJS)
-	gcc -shared $(YAFFSSWIGOBJS) -o $@
-
 libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
 	gcc -shared $(YAFFSLIBOBJS) -o $@
 
@@ -96,8 +80,6 @@ libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
 
 
 clean:
-	rm -f _yaffs.so yaffs.py yaffs.pyc yaffs_wrap.c $(YAFFSLIBOBJS) yaffs_wrap.o core $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
-	rm -f *.c.*
-	rm -f yaffsfs_for_swig.h
+	rm -f  $(YAFFSLIBOBJS)  core $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
 	rm -f libyaffsfs.so
-
+	rm -f *.pyc