improved xxpdf dependencies

diff --git a/lib/pdf/Makefile.in b/lib/pdf/Makefile.in
index 4eb3d4c..53c2ce3 100644 (file)
--- a/lib/pdf/Makefile.in
+++ b/lib/pdf/Makefile.in
@@ -144,9 +144,15 @@ xpdf/%.$(O): xpdf/%.cc
        $(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_in_source) $(splash_in_source)
        $(RANLIB) ../libpdf$(A)
 
        $(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_in_source) $(splash_in_source)
        $(RANLIB) ../libpdf$(A)
 

-xpdfapp_objects=xpdf/XPDF*.cc xpdf/PDFCore.cc xpdf/TextOutputDev.cc xpdf/xpdf.cc xpdf/CoreOutputDev.cc xpdf/UnicodeTypeTable.cc xpdf/PSOutputDev.cc
-xxpdf$(E): $(xpdf_objects) xpdf/Splash*.cc
-       $(LL) $(CPPFLAGS) -DXPDFEXE -g -I xpdf -I . $(xpdfapp_objects) $(xpdf_objects) xpdf/Splash*.cc xpdf/parseargs.c -o xxpdf$(E) $(LIBS) -lXm -lX11
+
+
+xpdfapp_sources=xpdf/XPDFApp.cc xpdf/XPDFCore.cc xpdf/XPDFTree.cc xpdf/XPDFViewer.cc xpdf/PDFCore.cc xpdf/TextOutputDev.cc xpdf/xpdf.cc xpdf/CoreOutputDev.cc xpdf/UnicodeTypeTable.cc xpdf/PSOutputDev.cc
+splash_sources=xpdf/Splash.cc xpdf/SplashBitmap.cc xpdf/SplashClip.cc xpdf/SplashFTFont.cc xpdf/SplashFTFontEngine.cc xpdf/SplashFTFontFile.cc xpdf/SplashFont.cc xpdf/SplashFontEngine.cc xpdf/SplashFontFile.cc xpdf/SplashFontFileID.cc xpdf/SplashOutputDev.cc xpdf/SplashPath.cc xpdf/SplashPattern.cc xpdf/SplashScreen.cc xpdf/SplashState.cc xpdf/SplashT1Font.cc xpdf/SplashT1FontEngine.cc xpdf/SplashT1FontFile.cc xpdf/SplashXPath.cc xpdf/SplashXPathScanner.cc
+xpdfapp_objects=xpdf/XPDFApp.$(O) xpdf/XPDFCore.$(O) xpdf/XPDFTree.$(O) xpdf/XPDFViewer.$(O) xpdf/PDFCore.$(O) xpdf/TextOutputDev.$(O) xpdf/xpdf.$(O) xpdf/CoreOutputDev.$(O) xpdf/UnicodeTypeTable.$(O) xpdf/PSOutputDev.$(O)
+
+#splash_objects=xpdf/Splash.$(O) xpdf/SplashBitmap.$(O) xpdf/SplashClip.$(O) xpdf/SplashFTFont.$(O) xpdf/SplashFTFontEngine.$(O) xpdf/SplashFTFontFile.$(O) xpdf/SplashFont.$(O) xpdf/SplashFontEngine.$(O) xpdf/SplashFontFile.$(O) xpdf/SplashFontFileID.$(O) xpdf/SplashOutputDev.$(O) xpdf/SplashPath.$(O) xpdf/SplashPattern.$(O) xpdf/SplashScreen.$(O) xpdf/SplashState.$(O) xpdf/SplashT1Font.$(O) xpdf/SplashT1FontEngine.$(O) xpdf/SplashT1FontFile.$(O) xpdf/SplashXPath.$(O) xpdf/SplashXPathScanner.$(O)
+xxpdf$(E): $(xpdf_objects) $(xpdfapp_objects) $(splash_objects)
+       $(LL) $(CPPFLAGS) -DXPDFEXE -g -I xpdf -I . $(xpdfapp_objects) $(xpdf_objects) $(splash_objects) xpdf/parseargs.c -o xxpdf$(E) $(LIBS) -lXm -lX11

 
 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)
 
 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)