Move tracing out of yportenv.h

[yaffs2.git] / direct / python / Makefile

diff --git a/direct/python/Makefile b/direct/python/Makefile
index 5f24f97eeaab6d838c5243fa4e667655d14ac0a0..888854fc485e2a07c605010724a9ea7ccdbc4243 100644 (file)
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -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.5 2010-01-11 04:06:47 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -36,10 +36,9 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
                 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 \
@@ -51,28 +50,16 @@ YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h y
                       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
+                      yaffs_nandif.c yaffs_nandif.h yaffs_trace.h
 
 
 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 +70,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
+