X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2FMakefile.in;h=75240c6785b59963531c864548d96ded61c8d040;hb=dbf4023f60d7e0627bdc81941e4dddcbd9e77986;hp=82456cd32e7509393d324905a1c21aa3e614822c;hpb=5641844394ba7158cdc8579f8f34a781bc6ac3f2;p=swftools.git

diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in
index 82456cd..75240c6 100644
--- a/lib/python/Makefile.in
+++ b/lib/python/Makefile.in
@@ -3,10 +3,6 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
 
-#LIB=-L/usr/lib/python2.2/config/ -lpython2.2
-PYTHON_LIB=-lpython2.3
-PYTHON_INCLUDES=-I/usr/include/python2.3
-
 all: mypython swfpython SWF.so testmem
 
 primitives.o: primitives.c primitives.h
@@ -30,31 +26,35 @@ SWF.o: SWF.c pyutils.h primitives.h taglist.h
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c SWF.c -o SWF.o
 
 SWF.so: SWF.o taglist.o tag.o image.o tags.o tagmap.o action.o primitives.o pyutils.o ../librfxswf.a Makefile
-	$(L) -g -shared SWF.o tagmap.o taglist.o tag.o image.o tags.o action.o primitives.o pyutils.o  -o SWF.so ../librfxswf.a $(PYTHON_LIB) -ljpeg -lz -lt1 -lfreetype 
+	$(L) -g -shared SWF.o tagmap.o taglist.o tag.o image.o tags.o action.o primitives.o pyutils.o  -o SWF.so $(PYTHON_LIB) ../librfxswf.a $(LIBS)
 
 mypython: mypython.c Makefile
-	$(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) mypython.c -o mypython $(PYTHON_LIB) -ldl -lm -lpthread -lutil
+	$(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) mypython.c -o mypython $(PYTHON_LIB)
 
 swfpython: swfpython.c Makefile primitives.o tagmap.o taglist.o tag.o tags.o action.o pyutils.o SWF.o
-	$(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) swfpython.c -o swfpython $(PYTHON_LIB) -ldl -lm -lpthread -lutil ../librfxswf.a $(PYTHON_LIB) -ljpeg -lz -lt1 -lfreetype 
+	$(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) swfpython.c -o swfpython $(PYTHON_LIB) ../librfxswf.a $(LIBS)
 
 testmem: testmem.c Makefile
-	$(L) $(PYTHON_INCLUDES) testmem.c -o testmem $(PYTHON_LIB) -ldl -lm -lpthread -lutil
+	$(L) $(PYTHON_INCLUDES) testmem.c -o testmem $(PYTHON_LIB) $(LIBS)
 
-test: test3
+test: test6
 
 test1: SWF.so
 	./test_create.py
 	swfdump -p tmp/test.swf
-
 test2: SWF.so
 	./test_combine.py
 	swfdump -u -p tmp/combined.swf
-
 test3: SWF.so
 	./test_simple.py
 test4: SWF.so
 	./test_movie.py
+	swfdump -u -p tmp/test.swf
+test5: SWF.so
+	./test_image.py
+	swfdump -u -p tmp/test.swf
+test6: SWF.so
+	./test_sprite.py
 clean:
 	rm -f *.o *.so mypython swfpython