X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2FMakefile.in;h=9cdec8c2e0e07d770cf46899163cb81a34447b89;hb=e069f3af1280183fa6e3d219ace624c31aef0080;hp=312c92e2ae13e548ed451da1a68cc9dcaed14076;hpb=3477d799207e51e1cde8d1d8792ae838cc1f2835;p=swftools.git

diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in
index 312c92e..9cdec8c 100644
--- a/lib/python/Makefile.in
+++ b/lib/python/Makefile.in
@@ -3,11 +3,7 @@ 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
+all: mypython swfpython SWF.$(SLEXT) testmem
 
 primitives.o: primitives.c primitives.h
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c primitives.c -o primitives.o
@@ -19,6 +15,8 @@ tag.o: tag.c tag.h tagmap.h
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tag.c -o tag.o
 tags.o: tags.c tags.h tagmap.h tag.h
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tags.c -o tags.o
+image.o: image.c image.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c image.c -o image.o
 action.o: action.c action.h
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c action.c -o action.o
 pyutils.o: pyutils.c pyutils.h
@@ -27,32 +25,36 @@ pyutils.o: pyutils.c pyutils.h
 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 tags.o tagmap.o action.o primitives.o pyutils.o ../librfxswf.a Makefile
-	$(L) -g -shared SWF.o tagmap.o taglist.o tag.o tags.o action.o primitives.o pyutils.o  -o SWF.so ../librfxswf.a $(PYTHON_LIB) -ljpeg -lz -lt1 -lfreetype 
+SWF.$(SLEXT): 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.$(SLEXT) $(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
+test1: SWF.$(SLEXT)
 	./test_create.py
 	swfdump -p tmp/test.swf
-
-test2: SWF.so
+test2: SWF.$(SLEXT)
 	./test_combine.py
 	swfdump -u -p tmp/combined.swf
-
-test3: SWF.so
+test3: SWF.$(SLEXT)
 	./test_simple.py
-test4: SWF.so
+test4: SWF.$(SLEXT)
 	./test_movie.py
+	swfdump -u -p tmp/test.swf
+test5: SWF.$(SLEXT)
+	./test_image.py
+	swfdump -u -p tmp/test.swf
+test6: SWF.$(SLEXT)
+	./test_sprite.py
 clean:
 	rm -f *.o *.so mypython swfpython