X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FMakefile.in;h=292d1cedaf3728bc519622c1d6073850f319b4a6;hb=d047ab5d9aee6224e864c10bce623e43c56a13c3;hp=fea30b703b38244d2f283ed8a6bceabc1dbee6bd;hpb=191439ab6ffe1cad91825ae84286bf720370f863;p=swftools.git

diff --git a/lib/pdf/Makefile.in b/lib/pdf/Makefile.in
index fea30b7..292d1ce 100644
--- a/lib/pdf/Makefile.in
+++ b/lib/pdf/Makefile.in
@@ -6,7 +6,9 @@ include ../../Makefile.common
 
 all: ../libpdf$(A) pdf2swf
 
-libpdf_objects = GFXOutputDev.$(O) InfoOutputDev.$(O) pdf.$(O)
+libpdf: ../libpdf$(A)
+
+libpdf_objects = GFXOutputDev.$(O) InfoOutputDev.$(O) pdf.$(O) fonts.$(O)
 
 xpdf_objects =  xpdf/GHash.$(O) xpdf/GList.$(O) xpdf/GString.$(O) xpdf/gmem.$(O) xpdf/gfile.$(O) \
 		  xpdf/FoFiTrueType.$(O) xpdf/FoFiType1.$(O) xpdf/FoFiType1C.$(O) xpdf/FoFiBase.$(O) xpdf/FoFiEncodings.$(O) \
@@ -19,13 +21,15 @@ xpdf_objects =  xpdf/GHash.$(O) xpdf/GList.$(O) xpdf/GString.$(O) xpdf/gmem.$(O)
 		  xpdf/GfxState.$(O) xpdf/Function.$(O) xpdf/Annot.$(O) xpdf/NameToCharCode.$(O) xpdf/UnicodeMap.$(O) \
 		  xpdf/SecurityHandler.$(O)
 
+fonts.$(O): fonts.c
+	$(C) -I ./ -I xpdf fonts.c -o $@
 cmyk.$(O): cmyk.cc
 	$(CC) -I ./ -I xpdf cmyk.cc -o $@
 GFXOutputDev.$(O): GFXOutputDev.cc GFXOutputDev.h
 	$(CC) -I ./ -I xpdf GFXOutputDev.cc -o $@
 InfoOutputDev.$(O): InfoOutputDev.cc InfoOutputDev.h
 	$(CC) -I ./ -I xpdf InfoOutputDev.cc -o $@
-pdf.$(O): pdf.cc
+pdf.$(O): pdf.cc GFXOutputDev.h InfoOutputDev.h
 	$(CC) -I ./ -I xpdf pdf.cc -o $@
 
 xpdf/UnicodeMap.$(O): xpdf/UnicodeMap.cc
@@ -114,23 +118,25 @@ xpdf/GHash.$(O): xpdf/GHash.cc
 	$(CC) -I ./ -I xpdf xpdf/GHash.cc -o $@
 xpdf/gfile.$(O): xpdf/gfile.cc
 	$(CC) -I ./ -I xpdf xpdf/gfile.cc -o $@
-xpdf/gmem.$(O): xpdf/gmem.c
-	$(C) -I ./ -I xpdf xpdf/gmem.c -o $@
+xpdf/gmem.$(O): xpdf/gmem.cc
+	$(C) -I ./ -I xpdf xpdf/gmem.cc -o $@
 
 ../libpdf$(A): $(libpdf_objects) $(xpdf_objects)
 	$(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_objects)
 	$(RANLIB) ../libpdf$(A)
 
 pdftoppm$(E): $(xpdf_objects) xpdf/Splash*.cc
-	$(LL) $(CPPFLAGS) -DXPDFEXE -g -I xpdf -I . xpdf/pdftoppm.cc $(xpdf_objects) xpdf/Splash*.cc xpdf/parseargs.c -o pdftoppm$(E) $(LIBS) -lt1
+	$(LL) $(CPPFLAGS) -DXPDFEXE -g -I xpdf -I . xpdf/pdftoppm.cc $(xpdf_objects) xpdf/Splash*.cc xpdf/parseargs.c -o pdftoppm$(E) $(LIBS)
 pdftotext$(E): $(xpdf_objects)
-	$(LL) $(CPPFLAGS) -DXPDFEXE -g -I xpdf -I . xpdf/pdftotext.cc $(xpdf_objects) xpdf/TextOutput*.cc xpdf/UnicodeType*.cc xpdf/parseargs.c -o pdftotext$(E) $(LIBS) -lt1
-pdf2swf$(E): $(xpdf_objects) $(libpdf_objects) ../../src/pdf2swf.c
-	$(LL) $(CPPFLAGS) ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_objects) ../devices/swf.$(O) ../devices/arts.$(O) ../librfxswf$(A) ../art/libart.a ../os.$(O) ../gfxtools.$(O) ../gfxfont.$(O) -o pdf2swf$(E) $(LIBS)
+	$(LL) $(CPPFLAGS) -DXPDFEXE -g -I xpdf -I . xpdf/pdftotext.cc $(xpdf_objects) xpdf/TextOutput*.cc xpdf/UnicodeType*.cc xpdf/parseargs.c -o pdftotext$(E) $(LIBS)
+pdf2swf$(E): $(xpdf_objects) $(libpdf_objects) ../../src/pdf2swf.c ../devices/swf.$(O) ../devices/record.$(O) ../devices/arts.$(O) ../devices/ops.$(O) ../devices/render.$(O) ../libbase$(A)
+	$(LL) $(CPPFLAGS) -g ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_objects) ../devices/swf.$(O) ../devices/arts.$(O) ../devices/record.$(O) ../devices/render.$(O) ../devices/ops.$(O) ../png.$(O) ../librfxswf$(A) ../art/libart.a ../gfxtools.$(O) ../gfxfont.$(O) ../libbase$(A) -o pdf2swf$(E) $(LIBS)
 
 install:
 uninstall:
 
+
 clean: 
 	rm -f xpdf/*.o xpdf/*.obj *.o pdf2swf pdftoppm pdftotext pdf2swf.exe pdftoppm.exe pdftotext.exe *.obj *.lo *.a *.lib *.la gmon.out
 
+.PHONY: clean install uninstall check all