X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpython%2FMakefile;h=3b87a749c3dc8ea0a578641923f5eb4e33bf5413;hb=3281edc9ef69c0ba876f0146f55540227aa6a7fb;hp=0ab8c4b660db5bcb6c7bd0be2a84cc3325f084cb;hpb=726d172d02228a2e9b084efba8d3173994343c2b;p=swftools.git

diff --git a/lib/python/Makefile b/lib/python/Makefile
index 0ab8c4b..3b87a74 100644
--- a/lib/python/Makefile
+++ b/lib/python/Makefile
@@ -1,34 +1,35 @@
 all: mypython SWF.so
 
 LIB=-L/usr/lib/python2.2/config/ -lpython2.2
+I=-I/usr/include/python2.2
 
 primitives.o: primitives.c primitives.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c primitives.c -o primitives.o
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c primitives.c -o primitives.o
 tagmap.o: tagmap.c tagmap.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c tagmap.c -o tagmap.o
-taglist.o: taglist.c taglist.h tagmap.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c taglist.c -o taglist.o
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c tagmap.c -o tagmap.o
+taglist.o: taglist.c taglist.h tagmap.h tag.h
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c taglist.c -o taglist.o
 tag.o: tag.c tag.h tagmap.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c tag.c -o tag.o
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c tag.c -o tag.o
 action.o: action.c action.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c action.c -o action.o
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c action.c -o action.o
 pyutils.o: pyutils.c pyutils.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c pyutils.c -o pyutils.o
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c pyutils.c -o pyutils.o
 
-SWF.o: SWF.c pyutils.h primitives.h
-	gcc -g -O2 -Wall -Wno-unused -fPIC -I/usr/include/python2.2 -c SWF.c -o SWF.o
+SWF.o: SWF.c pyutils.h primitives.h taglist.h
+	gcc -g -O2 -Wall -Wno-unused -fPIC $(I) -c SWF.c -o SWF.o
 
 SWF.so: SWF.o taglist.o tag.o tagmap.o action.o primitives.o pyutils.o ../librfxswf.a
-	gcc -shared SWF.o tagmap.o taglist.o tag.o action.o primitives.o pyutils.o  -o SWF.so $(LIB) ../librfxswf.a -ljpeg -lz -lt1 -lfreetype
-	cp SWF.so test
+	gcc -shared SWF.o tagmap.o taglist.o tag.o action.o primitives.o pyutils.o  -o SWF.so ../librfxswf.a -ljpeg -lz -lt1 -lfreetype
 
 mypython: mypython.c
 	gcc -g -I/usr/include/python2.2 mypython.c -o mypython $(LIB) -ldl -lm -lpthread -lutil
 
 test: SWF.so
-	cd test;./test_create.py
-	#python fonts.py
-	swfdump -p test/test.swf
+	#./test_create.py
+	#swfdump -p test/test.swf
+	./test_combine.py
+	swfdump -p tmp/combined.swf
 clean:
 	rm *.o *.so mypython