summaryrefslogtreecommitdiff
path: root/print/xpdf/patches/patch-am
blob: 1976a86aca52c05697489733c112560b02a009cc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
$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 @@
 SPLASHSRCDIR = $(srcdir)/../splash
 SPLASHLIBDIR = ../splash
 
-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
+CXXFLAGS = @CXXFLAGS@ @DEFS@ -DPREFIX="\"@prefix@\"" -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
 
 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)
 
 #------------------------------------------------------------------------