X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2FMakefile.in;h=01ccc4fc11caad401097df66f13109eaadd9607a;hb=831cb66afd5c8783ccbef44c6df013278dcc394a;hp=efd03a0c8cd9a3f51f07d9c2b0fe200f1204f624;hpb=a42cd5b08155ba4abd12c669b10199dfe8cf3855;p=swftools.git

diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in
index efd03a0..01ccc4f 100644
--- a/lib/python/Makefile.in
+++ b/lib/python/Makefile.in
@@ -3,7 +3,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
 
-all: SWF.$(SLEXT) gfx.$(SLEXT)
+all: SWF.$(SLEXT) SWF$(A) gfx.$(SLEXT) gfx$(A)
 exe: mypython$(E) swfpython$(E) testmem$(E)
 
 primitives.$(O): primitives.c primitives.h
@@ -22,17 +22,24 @@ 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
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c pyutils.c -o pyutils.$(O)
-gfx.$(O): gfx.c gfx.h
+gfx.$(O): gfx.c 
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c gfx.c -o gfx.$(O)
 
 SWF.$(O): SWF.c pyutils.h primitives.h taglist.h
 	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c SWF.c -o SWF.$(O)
 
-SWF.$(SLEXT): SWF.$(O) taglist.$(O) tag.$(O) image.$(O) tags.$(O) tagmap.$(O) action.$(O) primitives.$(O) pyutils.$(O) ../librfxswf$(A) ../png.$(O) 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) ../png.$(O) $(LIBS)
+SWF_OBJS=SWF.$(O) taglist.$(O) tag.$(O) image.$(O) tags.$(O) tagmap.$(O) action.$(O) primitives.$(O) pyutils.$(O) 
+SWF_DEPS=../librfxswf$(A) ../libbase$(A) ../art/libart$(A) 
+SWF.$(SLEXT): $(SWF_OBJS) $(SWF_DEPS) Makefile
+	$(L) -g $(SHARED) $(SWF_OBJS) $(SWF_DEPS) -o SWF.$(SLEXT) $(PYTHON_LIB) $(LIBS)
+SWF$(A): $(SWF_OBJS) $(SWF_DEPS) Makefile
+	$(AR) cru SWF$(A) $(SWF_OBJS) $(SWF_DEPS)
 
-gfx.$(SLEXT): gfx.$(O) ../lib/png.$(O) ../lib/libpdf$(A) ../lib/devices/swf.$(O) ../lib/devices/render.$(O) ../lib/devices/rescale.$(O) ../lib/gfxtools.$(O) ../lib/librfxswf$(A) ../lib/gfxfont.$(O) ../lib/art/libart.a Makefile
-	$(L) -g $(SHARED) gfx.$(O) -o gfx.$(SLEXT) $(PYTHON_LIB) gfx.$(O) ../lib/png.$(O) ../lib/libpdf$(A) ../lib/devices/swf.$(O) ../lib/devices/render.$(O) ../lib/devices/rescale.$(O) ../lib/gfxtools.$(O) ../lib/librfxswf$(A) ../lib/gfxfont.$(O) ../lib/art/libart.a $(LIBS)
+GFX_DEPS=../libpdf$(A) ../devices/swf.$(O) ../librfxswf$(A) ../devices/arts.$(O) ../art/libart$(A) ../libgfx$(A) ../libbase$(A) 
+gfx.$(SLEXT): gfx.$(O) $(GFX_DEPS) Makefile
+	$(L) -g $(SHARED) gfx.$(O) -o gfx.$(SLEXT) $(GFX_DEPS) $(PYTHON_LIB) $(LIBS) $(CXXLIBS)
+gfx$(A): gfx.$(O) $(GFX_DEPS) Makefile
+	$(AR) cru gfx$(A) gfx.$(O) $(GFX_DEPS)
 
 #TODO:
 install: