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

diff --git a/direct/python/Makefile b/direct/python/Makefile
index 5f24f97..4697420 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
 
@@ -33,19 +33,20 @@ 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
 
 
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_wrap.o yaffs_swig_helper.o
+YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.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 \
           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
 
 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,23 +57,11 @@ YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h y
 
 SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
 
-all: _yaffs.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" \
-	> $@
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -I/usr/include/python2.6/  -o $@ $<
+$(YAFFSLIBOBJS): %.o: %.c
+	gcc -c $(CFLAGS)   -o $@ $<
 
 
 $(YAFFSSYMLINKS):
@@ -83,13 +72,13 @@ $(YAFFSDIRECTSYMLINKS):
 
 
 
-_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 $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
+	rm -f libyaffsfs.so
+