X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FMakefile.in;h=d28bb4585c0e1fcbbbfb96c37402256430bac1dc;hb=39256331a887c5d462253ab1aea538ee2e4fd4ba;hp=c00042030ac27c9433751f97ff6f38f6173cac49;hpb=35727bd4787aeef582c43772cb13a79c0b680873;p=swftools.git

diff --git a/lib/pdf/Makefile.in b/lib/pdf/Makefile.in
index c000420..d28bb45 100644
--- a/lib/pdf/Makefile.in
+++ b/lib/pdf/Makefile.in
@@ -20,12 +20,17 @@ xpdf_objects =  xpdf/GHash.$(O) xpdf/GList.$(O) xpdf/GString.$(O) xpdf/gmem.$(O)
 		  xpdf/PSTokenizer.$(O) xpdf/FontEncodingTables.$(O) xpdf/BuiltinFont.$(O) xpdf/BuiltinFontTables.$(O) \
 		  xpdf/GfxState.$(O) xpdf/Function.$(O) xpdf/Annot.$(O) xpdf/NameToCharCode.$(O) xpdf/UnicodeMap.$(O) \
 		  xpdf/SecurityHandler.$(O)
+splash_objects = xpdf/SplashOutputDev.$(O) xpdf/SplashFont.$(O) xpdf/SplashState.$(O) xpdf/Splash.$(O) \
+		 xpdf/SplashBitmap.$(O) xpdf/SplashClip.$(O) xpdf/SplashPattern.$(O) \
+		 xpdf/SplashFontEngine.$(O) xpdf/SplashFontFile.$(O) xpdf/SplashFontFileID.$(O) \
+		 xpdf/SplashScreen.$(O) xpdf/SplashPath.$(O) xpdf/SplashXPath.$(O) xpdf/SplashXPathScanner.$(O) \
+		 xpdf/SplashFTFontEngine.$(O) xpdf/SplashFTFontFile.$(O) xpdf/SplashFTFont.$(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
+GFXOutputDev.$(O): GFXOutputDev.cc GFXOutputDev.h ../devices/artsutils.c
 	$(CC) -I ./ -I xpdf GFXOutputDev.cc -o $@
 InfoOutputDev.$(O): InfoOutputDev.cc InfoOutputDev.h
 	$(CC) -I ./ -I xpdf InfoOutputDev.cc -o $@
@@ -121,20 +126,29 @@ xpdf/gfile.$(O): xpdf/gfile.cc
 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)
+xpdf/%.$(O): xpdf/%.cc
+	$(CC) -I ./ -I xpdf $< -o $@
+
+
+../libpdf$(A): $(libpdf_objects) $(xpdf_objects) $(splash_objects)
+	$(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_objects) $(splash_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)
-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 ../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)
+pdftotext$(E): $(xpdf_objects) $(splash_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)
+
+gfx_objects = ../devices/swf.$(O) ../devices/arts.$(O) ../libgfx$(A) ../art/libart$(A) ../librfxswf$(A) ../libbase$(A)
+
+pdf2swf$(E): ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_objects) $(splash_objects) $(gfx_objects)
+	$(LL) $(CPPFLAGS) -g ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_objects) $(splash_objects) $(gfx_objects) -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