X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2FMakefile.in;h=0c8fb1583a7a9a0599c8965f8be55359a54e6c4f;hb=df99e9de2273822d54a2efa8d02a08e90181ede1;hp=456cec98ad28ebd589608c012e5218fc9a43a096;hpb=cff35345a96c796a0fc1ac92b8a213629d2299f9;p=swftools.git

diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in
index 456cec9..0c8fb15 100644
--- a/lib/python/Makefile.in
+++ b/lib/python/Makefile.in
@@ -3,7 +3,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
 
-all: SWF.$(SLEXT) SWF$(A) gfx.$(SLEXT) gfx$(A)
+all: SWF.$(SLEXT) gfx.$(SLEXT)
+static: SWF$(A) gfx$(A)
 exe: mypython$(E) swfpython$(E) testmem$(E)
 
 primitives.$(O): primitives.c primitives.h
@@ -36,12 +37,13 @@ SWF$(A): $(SWF_OBJS) $(SWF_DEPS) Makefile
 	$(AR) cru SWF$(A) $(SWF_OBJS) $(SWF_DEPS)
 	$(RANLIB) SWF$(A)
 
-GFX_DEPS=../libpdf$(A) ../libgfxswf$(A)  ../librfxswf$(A) ../libgfx$(A) ../libbase$(A) 
+GFX_DEPS=../libgfxpdf$(A) ../libgfxswf$(A)  ../librfxswf$(A) ../libgfx$(A) ../libocr$(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
-	mkdir tmp;cd tmp;for file in $(GFX_DEPS);do ar x ../$$file || cp ../$$file .;done
-	$(AR) cru gfx$(A) gfx.$(O) tmp/*.$(O)
+	mkdir -p tmp 
+	ar cru gfx$(A) gfx.$(O)
+	for file in $(GFX_DEPS);do rm -f tmp/*;cd tmp;ar x ../$$file || cp ../$$file .;cd ..;$(AR) q gfx$(A) tmp/*.$(O) || break;done
 	$(RANLIB) gfx$(A)
 
 #TODO:
@@ -76,4 +78,4 @@ test6: SWF.$(SLEXT)
 clean:
 	rm -f *.o *.obj *.so mypython swfpython
 
-.PHONY: test,test1,test2
+.PHONY: test test1 test2 static all exe