X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2FMakefile.in;h=8c8c80217a2ee001620ad680fdb0cd1718c536b6;hp=f176f650eddbac92120a0b1c44c28a14288750fa;hb=c63b2bf21dc1df9a736f0b4c08f6cba828cdab92;hpb=727449f065760e1d99735f44638c25678cd8bc52

diff --git a/src/Makefile.in b/src/Makefile.in
index f176f65..8c8c802 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,6 +16,8 @@ pdf2swf.$(O): pdf2swf.c
 	$(C) pdf2swf.c -o $@
 pdf2pdf.$(O): pdf2pdf.c
 	$(C) pdf2pdf.c -o $@
+gfx2gfx.$(O): gfx2gfx.c
+	$(C) gfx2gfx.c -o $@
 gif2swf.$(O): gif2swf.c
 	$(C) gif2swf.c -o $@
 swfcombine.$(O): swfcombine.c
@@ -51,9 +53,18 @@ swfc-interpolation.$(O): swfc-interpolation.c swfc-interpolation.h ../lib/q.h
 parser.$(O): parser.yy.c parser.h ../lib/q.h
 	$(C) parser.yy.c -o $@
 
-../lib/librfxswf$(A): ../lib/modules/swfrender.c ../lib/modules/swfshape.c ../lib/modules/swfbits.c ../lib/rfxswf.c
+../lib/librfxswf$(A): ../lib/modules/swfrender.c ../lib/modules/swfshape.c ../lib/modules/swftext.c ../lib/modules/swffont.c ../lib/modules/swfbits.c ../lib/rfxswf.c ../lib/devices/swf.c ../lib/modules/swfalignzones.c
 	cd ../lib;$(MAKE) librfxswf$(A);cd -
 
+../lib/libgfxpdf$(A): ../lib/pdf/GFXOutputDev.cc
+	cd ../lib;$(MAKE) libgfxpdf$(A);cd -
+
+../lib/libgfx$(A): ../lib/devices/*.c ../lib/gfxdevice.h ../lib/gfxtools.c ../lib/gfxfont.c
+	cd ../lib;$(MAKE) libgfx$(A);cd -
+
+../lib/libgfxswf$(A): ../lib/devices/swf.c
+	cd ../lib;$(MAKE) libgfxswf$(A);cd -
+
 # TODO: include the following rule only if lex is available
 parser.yy.c: parser.lex
 	flex -B -s -oparser.yy.c parser.lex
@@ -101,13 +112,18 @@ swfrender$(E): swfrender.$(O) ../lib/libgfxswf$(A) ../lib/librfxswf$(A) ../lib/l
 	$(L) swfrender.$(O) -o $@ ../lib/libgfxswf$(A) ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/libbase$(A) $(LIBS) 
 	$(STRIP) $@
 
-PDF2SWF_OBJ=../lib/libgfxswf$(A) ../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/libgfx$(A) ../lib/libbase$(A)
+PDF2SWF_OBJ=../lib/libgfxswf$(A) ../lib/librfxswf$(A) ../lib/libgfxpdf$(A) ../lib/libgfx$(A) ../lib/libbase$(A)
+OCR_OBJ=../lib/libocr$(A)
+
 pdf2swf$(E): pdf2swf.$(O) $(PDF2SWF_OBJ)
 	$(LL) pdf2swf.$(O) -o $@ $(PDF2SWF_OBJ) $(LIBS) $(CXXLIBS)
 	$(STRIP) $@
 pdf2pdf$(E): pdf2pdf.$(O) $(PDF2SWF_OBJ)
 	$(LL) pdf2pdf.$(O) -o $@ $(PDF2SWF_OBJ) $(LIBS) $(CXXLIBS)
 	$(STRIP) $@
+gfx2gfx$(E): gfx2gfx.$(O) $(OCR_OBJ) $(PDF2SWF_OBJ) 
+	$(LL) gfx2gfx.$(O) -o $@ $(OCR_OBJ) $(PDF2SWF_OBJ) $(LIBS) $(CXXLIBS)
+	$(STRIP) $@
 swfc$(E): parser.$(O) swfc.$(O) swfc-feedback.$(O) swfc-history.$(O) swfc-interpolation.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A) 
 	$(L) parser.$(O) swfc.$(O) swfc-feedback.$(O) swfc-history.$(O) swfc-interpolation.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
@@ -122,9 +138,9 @@ uninstall:
 
 clean: 
 	rm -f *.o *.obj *.lo *.la *~ gmon.out
-	rm -f as3compile gif2swf swfbbox swfbytes swfbytes swfdump pdf2swf wav2swf png2swf swfcombine swfextract swfstrings png2swf jpeg2swf swfc font2swf
-	@rm -f gif2swf.exe swfbytes.exe swfbytes.exe pdf2swf.exe swfbbox.exe swfdump.exe wav2swf.exe png2swf.exe swfcombine.exe swfextract.exe swfstrings.exe png2swf.exe jpeg2swf.exe swfc.exe font2swf.exe
-	@rm -f gif2swf$(E) pdf2swf$(E) swfbytes$(E) swfbytes$(E) swfbbox$(E) swfdump$(E) wav2swf$(E) png2swf$(E) swfcombine$(E) swfextract$(E) swfstrings$(E) png2swf$(E) jpeg2swf$(E) swfc$(E) font2swf$(E)
+	rm -f as3compile gif2swf swfbbox swfbytes swfbytes swfdump pdf2swf wav2swf png2swf swfcombine swfextract swfstrings png2swf jpeg2swf swfc font2swf pdf2pdf gfx2gfx
+	@rm -f gif2swf.exe swfbytes.exe swfbytes.exe pdf2swf.exe swfbbox.exe swfdump.exe wav2swf.exe png2swf.exe swfcombine.exe swfextract.exe swfstrings.exe png2swf.exe jpeg2swf.exe swfc.exe font2swf.exe pdf2pdf.exe gfx2gfx.exe
+	@rm -f gif2swf$(E) pdf2swf$(E) swfbytes$(E) swfbytes$(E) swfbbox$(E) swfdump$(E) wav2swf$(E) png2swf$(E) swfcombine$(E) swfextract$(E) swfstrings$(E) png2swf$(E) jpeg2swf$(E) swfc$(E) font2swf$(E) pdf2pdf$(E) gfx2gfx$(E)
 
 doc:
 	perl ../parsedoc.pl wav2swf.doc