summaryrefslogtreecommitdiff
path: root/print/poppler/patches/patch-ab
blob: b0f4d74b3f90a7d72b764cdab709e355793dd7b2 (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
$NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $

--- utils/Makefile.in.orig	2013-02-10 10:48:38.000000000 +0000
+++ utils/Makefile.in
@@ -76,7 +76,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 	$(top_builddir)/poppler/poppler-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
+am__EXEEXT_1 = pdftoppm$(EXEEXT)
 @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -84,33 +84,33 @@ am__objects_1 = parseargs.$(OBJEXT)
 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
 pdfdetach_LDADD = $(LDADD)
-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfdetach_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
 pdffonts_LDADD = $(LDADD)
-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
 	$(am__objects_1)
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
 pdfimages_LDADD = $(LDADD)
-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
 	$(am__objects_1)
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
 pdfinfo_LDADD = $(LDADD)
-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
 pdfseparate_LDADD = $(LDADD)
-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfseparate_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h
 @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \
 @BUILD_CAIRO_OUTPUT_TRUE@	$(am__objects_1)
 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la
+am__DEPENDENCIES_1 = $(prefix)/lib/libpoppler.la
 am__DEPENDENCIES_2 =
 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
@@ -124,29 +124,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
 	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
 pdftohtml_LDADD = $(LDADD)
-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h
-@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
-@BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
+	$(am__objects_1)
 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
 pdftoppm_LDADD = $(LDADD)
-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
 pdftops_LDADD = $(LDADD)
-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
 	$(am__objects_1)
 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
 pdftotext_LDADD = $(LDADD)
-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
 pdfunite_LDADD = $(LDADD)
-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfunite_DEPENDENCIES = $(prefix)/lib/libpoppler.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -436,12 +436,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 win32_libs = @win32_libs@
-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
-@BUILD_SPLASH_OUTPUT_TRUE@	pdftoppm.cc				\
-@BUILD_SPLASH_OUTPUT_TRUE@	$(common)
+pdftoppm_SOURCES = \
+	pdftoppm.cc				\
+	$(common)
 
-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm
-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
+pdftoppm_binary = pdftoppm
+pdftoppm_manpage = pdftoppm.1
 INCLUDES = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/goo			\
@@ -451,8 +451,9 @@ INCLUDES = \
 	$(PDFTOCAIRO_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(UTILS_LIBS)
+	$(prefix)/lib/libpoppler.la	\
+	$(UTILS_LIBS)			\
+	$(PTHREAD_STUBLIB)
 
 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
 @BUILD_CAIRO_OUTPUT_TRUE@	pdftocairo.cc				\