diff options
author | christos <christos@pkgsrc.org> | 2009-11-13 23:12:02 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 2009-11-13 23:12:02 +0000 |
commit | 62fb48cbead8ec3b817b80edc8f21c5f9b454d2b (patch) | |
tree | 6f27f54a9c28ec2de20746093c0ea7ffd6ef2c1b /print | |
parent | 1ed70dc4593cad0655efe4d8b54a5c06c242704d (diff) | |
download | pkgsrc-62fb48cbead8ec3b817b80edc8f21c5f9b454d2b.tar.gz |
make those not conflict, by using the poppler version of the pdftofoo programs.
Diffstat (limited to 'print')
-rw-r--r-- | print/poppler-utils/Makefile | 3 | ||||
-rw-r--r-- | print/xpdf/Makefile | 8 | ||||
-rw-r--r-- | print/xpdf/PLIST | 14 | ||||
-rw-r--r-- | print/xpdf/distinfo | 6 | ||||
-rw-r--r-- | print/xpdf/patches/patch-aa | 112 | ||||
-rw-r--r-- | print/xpdf/patches/patch-am | 246 |
6 files changed, 361 insertions, 28 deletions
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile index e31cb42d121..35586fd5738 100644 --- a/print/poppler-utils/Makefile +++ b/print/poppler-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/09/09 19:57:06 drochner Exp $ +# $NetBSD: Makefile,v 1.10 2009/11/13 23:12:02 christos Exp $ # .include "../../print/poppler/Makefile.common" @@ -9,7 +9,6 @@ COMMENT= PDF utilities (from poppler) MAINTAINER= reed@reedmedia.net CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2 -CONFLICTS+= xpdf-[0-9]* GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index ed6847ceba1..bc4023e49b5 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2009/10/16 19:36:29 tez Exp $ +# $NetBSD: Makefile,v 1.69 2009/11/13 23:12:02 christos Exp $ DISTNAME= xpdf-3.02 PKGNAME= xpdf-3.02pl4 @@ -20,9 +20,9 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts +DEPENDS+= poppler-utils-[0-9]*:../poppler-utils CONFLICTS= xpdf-crypto-[0-9]* -CONFLICTS+= poppler-utils-[0-9]* USE_LANGUAGES= c c++ GNU_CONFIGURE= yes @@ -42,8 +42,8 @@ EGDIR= ${PREFIX}/share/examples/xpdf CONF_FILES= ${EGDIR}/xpdfrc ${PKG_SYSCONFDIR}/xpdfrc SUBST_CLASSES+= paths -SUBST_FILES.paths= doc/pdffonts.1 doc/pdfimages.1 doc/pdfinfo.1 -SUBST_FILES.paths+= doc/pdftoppm.1 doc/pdftops.1 doc/pdftotext.1 +#SUBST_FILES.paths= doc/pdffonts.1 doc/pdfimages.1 doc/pdfinfo.1 +#SUBST_FILES.paths+= doc/pdftoppm.1 doc/pdftops.1 doc/pdftotext.1 SUBST_FILES.paths+= doc/sample-xpdfrc doc/xpdf.1 doc/xpdfrc.5 SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST index e32e094460d..a76a4fa6374 100644 --- a/print/xpdf/PLIST +++ b/print/xpdf/PLIST @@ -1,17 +1,5 @@ -@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:12:03 joerg Exp $ -bin/pdffonts -bin/pdfimages -bin/pdfinfo -bin/pdftoppm -bin/pdftops -bin/pdftotext +@comment $NetBSD: PLIST,v 1.10 2009/11/13 23:12:02 christos Exp $ bin/xpdf -man/man1/pdffonts.1 -man/man1/pdfimages.1 -man/man1/pdfinfo.1 -man/man1/pdftoppm.1 -man/man1/pdftops.1 -man/man1/pdftotext.1 man/man1/xpdf.1 man/man5/xpdfrc.5 share/examples/xpdf/xpdfrc diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo index 02a37f45c01..8cb57705ba3 100644 --- a/print/xpdf/distinfo +++ b/print/xpdf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2009/10/16 19:36:29 tez Exp $ +$NetBSD: distinfo,v 1.36 2009/11/13 23:12:02 christos Exp $ SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d @@ -15,7 +15,7 @@ Size (xpdf-3.02pl3.patch) = 30727 bytes SHA1 (xpdf-3.02pl4.patch) = 1aa3087a1c7882884ae7d3a502240a55acca65fd RMD160 (xpdf-3.02pl4.patch) = 428065e8c9639b6799705b216be603f52efb8a22 Size (xpdf-3.02pl4.patch) = 6982 bytes -SHA1 (patch-aa) = 6664207f59076a2612cf4141b7ab4b072b404e3a +SHA1 (patch-aa) = d3694e51ec23026a3273d7a7acac1582b69f4810 SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90 SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a @@ -27,7 +27,7 @@ SHA1 (patch-ai) = 041f0b7afbd46e109a6c38a5edef5bd38bb41034 SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860 SHA1 (patch-ak) = ed9506fd0cba7e350608cd40b1f794253f30e917 SHA1 (patch-al) = b6e958b0592ac285b3ade90079c83da30db8a8b6 -SHA1 (patch-am) = 794ff952c749c8dab6f575d55602cdc7e7157fef +SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8 SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58 SHA1 (patch-aq) = 1df0efb9fdde90df0597ba2a56c6030e7446e185 diff --git a/print/xpdf/patches/patch-aa b/print/xpdf/patches/patch-aa index ea0bf80c3ed..1b6f2ae6e10 100644 --- a/print/xpdf/patches/patch-aa +++ b/print/xpdf/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2005/09/07 15:19:08 adam Exp $ +$NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $ --- Makefile.in.orig 2005-08-17 05:34:30.000000000 +0000 +++ Makefile.in -@@ -13,6 +13,7 @@ DESTDIR = +@@ -13,6 +13,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ @@ -10,8 +10,112 @@ $NetBSD: patch-aa,v 1.6 2005/09/07 15:19:08 adam Exp $ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -94,12 +95,12 @@ install: dummy - $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 +@@ -37,69 +38,69 @@ + cd @UP_DIR@splash; $(MAKE) + cd @UP_DIR@xpdf; $(MAKE) xpdf$(EXE) + +-pdftops: dummy +- cd goo; $(MAKE) +- cd @UP_DIR@fofi; $(MAKE) +- cd @UP_DIR@splash; $(MAKE) +- cd @UP_DIR@xpdf; $(MAKE) pdftops$(EXE) +- +-pdftotext: dummy +- cd goo; $(MAKE) +- cd @UP_DIR@fofi; $(MAKE) +- cd @UP_DIR@splash; $(MAKE) +- cd @UP_DIR@xpdf; $(MAKE) pdftotext$(EXE) +- +-pdfinfo: +- cd goo; $(MAKE) +- cd @UP_DIR@fofi; $(MAKE) +- cd @UP_DIR@splash; $(MAKE) +- cd @UP_DIR@xpdf; $(MAKE) pdfinfo$(EXE) +- +-pdffonts: +- cd goo; $(MAKE) +- cd @UP_DIR@fofi; $(MAKE) +- cd @UP_DIR@splash; $(MAKE) +- cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE) +- +-pdftoppm: +- cd goo; $(MAKE) +- cd @UP_DIR@fofi; $(MAKE) +- cd @UP_DIR@splash; $(MAKE) +- cd @UP_DIR@xpdf; $(MAKE) pdftoppm$(EXE) +- +-pdfimages: +- cd goo; $(MAKE) +- cd @UP_DIR@fofi; $(MAKE) +- cd @UP_DIR@splash; $(MAKE) +- cd @UP_DIR@xpdf; $(MAKE) pdfimages$(EXE) ++#pdftops: dummy ++# cd goo; $(MAKE) ++# cd @UP_DIR@fofi; $(MAKE) ++# cd @UP_DIR@splash; $(MAKE) ++# cd @UP_DIR@xpdf; $(MAKE) pdftops$(EXE) ++# ++#pdftotext: dummy ++# cd goo; $(MAKE) ++# cd @UP_DIR@fofi; $(MAKE) ++# cd @UP_DIR@splash; $(MAKE) ++# cd @UP_DIR@xpdf; $(MAKE) pdftotext$(EXE) ++# ++#pdfinfo: ++# cd goo; $(MAKE) ++# cd @UP_DIR@fofi; $(MAKE) ++# cd @UP_DIR@splash; $(MAKE) ++# cd @UP_DIR@xpdf; $(MAKE) pdfinfo$(EXE) ++# ++#pdffonts: ++# cd goo; $(MAKE) ++# cd @UP_DIR@fofi; $(MAKE) ++# cd @UP_DIR@splash; $(MAKE) ++# cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE) ++# ++#pdftoppm: ++# cd goo; $(MAKE) ++# cd @UP_DIR@fofi; $(MAKE) ++# cd @UP_DIR@splash; $(MAKE) ++# cd @UP_DIR@xpdf; $(MAKE) pdftoppm$(EXE) ++# ++#pdfimages: ++# cd goo; $(MAKE) ++# cd @UP_DIR@fofi; $(MAKE) ++# cd @UP_DIR@splash; $(MAKE) ++# cd @UP_DIR@xpdf; $(MAKE) pdfimages$(EXE) + + dummy: + + install: dummy + -mkdir -p $(DESTDIR)@bindir@ + @X@ $(INSTALL_PROGRAM) xpdf/xpdf$(EXE) $(DESTDIR)@bindir@/xpdf$(EXE) +- $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) +- $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) +- $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) +- $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) +-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) +- $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) ++# $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) ++# $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) ++# $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) ++# $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) ++#@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) ++# $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) + -mkdir -p $(DESTDIR)@mandir@/man1 + @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1 +- $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 +- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 +- $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 +- $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 +-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 +- $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 ++# $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 ++# $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 ++# $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 ++# $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 ++#@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 ++# $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 -mkdir -p $(DESTDIR)@mandir@/man5 $(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5 - -mkdir -p $(DESTDIR)@sysconfdir@ diff --git a/print/xpdf/patches/patch-am b/print/xpdf/patches/patch-am index 89e167a67be..1976a86aca5 100644 --- a/print/xpdf/patches/patch-am +++ b/print/xpdf/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2004/03/03 10:50:59 adam Exp $ +$NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $ --- xpdf/Makefile.in.orig 2004-01-22 01:26:45.000000000 +0000 +++ xpdf/Makefile.in -@@ -19,7 +19,7 @@ FOFILIBDIR = ../fofi +@@ -19,7 +19,7 @@ SPLASHSRCDIR = $(srcdir)/../splash SPLASHLIBDIR = ../splash @@ -11,3 +11,245 @@ $NetBSD: patch-am,v 1.1 2004/03/03 10:50:59 adam Exp $ LDFLAGS = @LDFLAGS@ +@@ -96,21 +96,13 @@ + $(srcdir)/XPDFViewer.cc \ + $(srcdir)/XpdfPluginAPI.cc \ + $(srcdir)/XRef.cc \ +- $(srcdir)/pdftops.cc \ +- $(srcdir)/pdftotext.cc \ +- $(srcdir)/pdfinfo.cc \ +- $(srcdir)/pdffonts.cc \ +- $(srcdir)/pdftoppm.cc \ +- $(srcdir)/pdfimages.cc \ + $(srcdir)/xpdf.cc + + #------------------------------------------------------------------------ + +-all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \ +- pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) ++all: xpdf$(EXE) + +-all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ +- pdfimages$(EXE) ++all-no-x: + + #------------------------------------------------------------------------ + +@@ -132,102 +124,102 @@ + + #------------------------------------------------------------------------ + +-PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +- JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ +- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ +- PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ +- SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ +- pdftops.o +-PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ +- $(OTHERLIBS) -lm +- +-pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \ +- $(PDFTOPS_LIBS) +- +-#------------------------------------------------------------------------ +- +-PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ +- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +- SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ +- UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o +-PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +- +-pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \ +- $(PDFTOTEXT_LIBS) +- +-#------------------------------------------------------------------------ +- +-PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ +- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +- SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ +- pdfinfo.o +-PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +- +-pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \ +- $(PDFINFO_LIBS) +- +-#------------------------------------------------------------------------ +- +-PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ +- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +- SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ +- pdffonts.o +-PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +- +-pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \ +- $(PDFFONTS_LIBS) +- +-#------------------------------------------------------------------------ +- +-PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ +- GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ +- Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ +- Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +- SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ +- UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o +-PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ +- $(OTHERLIBS) -lm +- +-pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \ +- $(PDFTOPPM_LIBS) +- +-#------------------------------------------------------------------------ +- +-PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ +- GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ +- JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ +- Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ +- PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ +- XpdfPluginAPI.o XRef.o pdfimages.o +-PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +- +-pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ +- $(PDFIMAGES_LIBS) ++#PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ ++# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ ++# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ ++# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ ++# JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ ++# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ ++# PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ ++# SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ ++# pdftops.o ++#PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ ++# $(OTHERLIBS) -lm ++# ++#pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a ++# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \ ++# $(PDFTOPS_LIBS) ++ ++#------------------------------------------------------------------------ ++ ++#PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ ++# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ ++# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ ++# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ ++# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ ++# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ ++# SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ ++# UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o ++#PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm ++# ++#pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a ++# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \ ++# $(PDFTOTEXT_LIBS) ++ ++#------------------------------------------------------------------------ ++ ++#PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ ++# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ ++# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ ++# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ ++# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ ++# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ ++# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ ++# pdfinfo.o ++#PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm ++# ++#pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a ++# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \ ++# $(PDFINFO_LIBS) ++ ++#------------------------------------------------------------------------ ++ ++#PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ ++# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ ++# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ ++# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ ++# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ ++# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ ++# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ ++# pdffonts.o ++#PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm ++# ++#pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a ++# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \ ++# $(PDFFONTS_LIBS) ++ ++#------------------------------------------------------------------------ ++ ++#PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ ++# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ ++# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ ++# GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ ++# Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ ++# Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ ++# SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ ++# UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o ++#PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ ++# $(OTHERLIBS) -lm ++# ++#pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a ++# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \ ++# $(PDFTOPPM_LIBS) ++ ++#------------------------------------------------------------------------ ++ ++#PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ ++# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ ++# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ ++# GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ ++# JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ ++# Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ ++# PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ ++# XpdfPluginAPI.o XRef.o pdfimages.o ++#PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm ++# ++#pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a ++# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ ++# $(PDFIMAGES_LIBS) + + #------------------------------------------------------------------------ + +@@ -239,12 +231,12 @@ + + clean: + rm -f $(XPDF_OBJS) xpdf$(EXE) +- rm -f $(PDFTOPS_OBJS) pdftops$(EXE) +- rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) +- rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) +- rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) +- rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) +- rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) ++# rm -f $(PDFTOPS_OBJS) pdftops$(EXE) ++# rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) ++# rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) ++# rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) ++# rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) ++# rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) + + #------------------------------------------------------------------------ + |