Attachment #151583 for bug #196599

Lines 3-10 Link Here

(-)poppler/Makefile (-2 / +2 lines)
3	# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $	3	# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
4		4
5	PORTNAME= poppler	5	PORTNAME= poppler
6	PORTVERSION= 0.26.3	6	PORTVERSION= 0.30.0
7	PORTREVISION?= 1	7	PORTREVISION?= 0
8	CATEGORIES= graphics print	8	CATEGORIES= graphics print
9	MASTER_SITES= http://poppler.freedesktop.org/	9	MASTER_SITES= http://poppler.freedesktop.org/
10		10

Lines 1-2 Link Here

(-)poppler/distinfo (-2 / +2 lines)
1	SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1	1	SHA256 (poppler-0.30.0.tar.xz) = b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5
2	SIZE (poppler-0.26.3.tar.xz) = 1593760	2	SIZE (poppler-0.30.0.tar.xz) = 1605292




--- glib/Makefile.in.orig	2014-11-04 18:46:21 UTC
+++ glib/Makefile.in
@@ -134,7 +134,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libpoppler_glib_la_DEPENDENCIES =  \
-	$(top_builddir)/poppler/libpoppler.la \
 	$(top_builddir)/poppler/libpoppler-cairo.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__objects_1 = libpoppler_glib_la-poppler-enums.lo
@@ -553,7 +552,7 @@ libpoppler_glib_la_CPPFLAGS = \
 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
 
 libpoppler_glib_la_LIBADD = \
-	$(top_builddir)/poppler/libpoppler.la		\

+	-lpoppler		\
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(POPPLER_GLIB_LIBS)				\
 	$(FREETYPE_LIBS)
@@ -576,7 +575,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) 
 @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib




--- utils/Makefile.in.orig	2014-11-04 18:46:22 UTC
+++ utils/Makefile.in
@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
 pdfdetach_LDADD = $(LDADD)
-pdfdetach_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfdetach_DEPENDENCIES = libparseargs.la
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
 am__v_lt_0 = --silent
@@ -119,31 +119,31 @@
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
 pdffonts_LDADD = $(LDADD)
-pdffonts_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdffonts_DEPENDENCIES = libparseargs.la
 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
 	JSInfo.$(OBJEXT)
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
 pdfimages_LDADD = $(LDADD)
-pdfimages_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfimages_DEPENDENCIES = libparseargs.la
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
 	JSInfo.$(OBJEXT)
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
 pdfinfo_LDADD = $(LDADD)
-pdfinfo_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfinfo_DEPENDENCIES = libparseargs.la
 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
 pdfseparate_LDADD = $(LDADD)
-pdfseparate_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfseparate_DEPENDENCIES = libparseargs.la
 am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
 	pdftocairo-pdftocairo-win32.$(OBJEXT)
 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
-am__DEPENDENCIES_1 = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+am__DEPENDENCIES_1 = libparseargs.la
 am__DEPENDENCIES_2 =
 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
+pdftocairo_DEPENDENCIES = \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
 	$(am__DEPENDENCIES_2)
 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
 	pdftohtml-HtmlOutputDev.$(OBJEXT)
 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
 pdftohtml_LDADD = $(LDADD)
-pdftohtml_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdftohtml_DEPENDENCIES = libparseargs.la
 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
 @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
 pdftoppm_LDADD = $(LDADD)
-pdftoppm_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdftoppm_DEPENDENCIES = libparseargs.la
 am_pdftops_OBJECTS = pdftops.$(OBJEXT)
 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
 pdftops_LDADD = $(LDADD)
-pdftops_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdftops_DEPENDENCIES = libparseargs.la
 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
 pdftotext_LDADD = $(LDADD)
-pdftotext_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdftotext_DEPENDENCIES = libparseargs.la
 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
 pdfunite_LDADD = $(LDADD)
-pdfunite_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfunite_DEPENDENCIES = libparseargs.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
 	$(PDFTOCAIRO_CFLAGS)
 
 LDADD = \
 	libparseargs.la				\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler	\
 	$(UTILS_LIBS)
 
 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
 	pdftocairo-win32.h
 
 pdftocairo_LDADD = \
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
+	-lpoppler-glib	\
 	$(LDADD)					\
 	$(PDFTOCAIRO_LIBS)				\
 	$(PTHREAD_LIBS)

Lines 134-143 Link Here

(-)poppler/pkg-plist (-3 / +3 lines)
134	include/poppler/splash/SplashXPathScanner.h	134	include/poppler/splash/SplashXPathScanner.h
135	lib/libpoppler-cpp.so	135	lib/libpoppler-cpp.so
136	lib/libpoppler-cpp.so.0	136	lib/libpoppler-cpp.so.0
137	lib/libpoppler-cpp.so.0.2.0	137	lib/libpoppler-cpp.so.0.2.1
138	lib/libpoppler.so	138	lib/libpoppler.so
139	lib/libpoppler.so.46	139	lib/libpoppler.so.49
140	lib/libpoppler.so.46.0.0	140	lib/libpoppler.so.49.0.0
141	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc	141	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
142	libdata/pkgconfig/poppler-cpp.pc	142	libdata/pkgconfig/poppler-cpp.pc
143	libdata/pkgconfig/poppler-splash.pc	143	libdata/pkgconfig/poppler-splash.pc

Lines 2-8 Link Here

(-)poppler-glib/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $	3	# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
4		4
5	PORTREVISION= 1	5	PORTREVISION= 0
6	PKGNAMESUFFIX= -glib	6	PKGNAMESUFFIX= -glib
7		7
8	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org

Lines 8-12 Link Here

(-)poppler-qt4/pkg-plist (-1 / +1 lines)
8	include/poppler/qt4/poppler-qt4.h	8	include/poppler/qt4/poppler-qt4.h
9	lib/libpoppler-qt4.so	9	lib/libpoppler-qt4.so
10	lib/libpoppler-qt4.so.4	10	lib/libpoppler-qt4.so.4
11	lib/libpoppler-qt4.so.4.4.0	11	lib/libpoppler-qt4.so.4.5.0
12	libdata/pkgconfig/poppler-qt4.pc	12	libdata/pkgconfig/poppler-qt4.pc

Lines 8-12 Link Here

(-)poppler-qt5/pkg-plist (-1 / +1 lines)
8	include/poppler/qt5/poppler-qt5.h	8	include/poppler/qt5/poppler-qt5.h
9	lib/libpoppler-qt5.so	9	lib/libpoppler-qt5.so
10	lib/libpoppler-qt5.so.1	10	lib/libpoppler-qt5.so.1
11	lib/libpoppler-qt5.so.1.1.0	11	lib/libpoppler-qt5.so.1.2.0
12	libdata/pkgconfig/poppler-qt5.pc	12	libdata/pkgconfig/poppler-qt5.pc

Return to bug 196599

Lines 1-15 Link Here

(-)poppler/files/patch-glib_Makefile.in (-8 / +17 lines)
1	--- glib/Makefile.in.orig 2011-10-03 23:55:25.000000000 +0200	1	--- glib/Makefile.in.orig 2014-11-04 18:46:21 UTC
2	+++ glib/Makefile.in 2011-10-03 23:56:20.000000000 +0200	2	+++ glib/Makefile.in
3	@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"	3	@@ -134,7 +134,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
4	LTLIBRARIES = $(lib_LTLIBRARIES)	4	LTLIBRARIES = $(lib_LTLIBRARIES)
5	am__DEPENDENCIES_1 =	5	am__DEPENDENCIES_1 =
6	libpoppler_glib_la_DEPENDENCIES = \	6	libpoppler_glib_la_DEPENDENCIES = \
7	- $(top_builddir)/poppler/libpoppler.la \	7	- $(top_builddir)/poppler/libpoppler.la \
8	$(top_builddir)/poppler/libpoppler-cairo.la \	8	$(top_builddir)/poppler/libpoppler-cairo.la \
9	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \	9	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
10	$(am__DEPENDENCIES_1)	10	am__objects_1 = libpoppler_glib_la-poppler-enums.lo
11	@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \	11	@@ -553,7 +552,7 @@ libpoppler_glib_la_CPPFLAGS = \
12	poppler-private.h	12	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
13		13
14	libpoppler_glib_la_LIBADD = \	14	libpoppler_glib_la_LIBADD = \
15	- $(top_builddir)/poppler/libpoppler.la \	15	- $(top_builddir)/poppler/libpoppler.la \
Lines 16-19 Link Here
16	+ -lpoppler \	16	+ -lpoppler \
17	$(top_builddir)/poppler/libpoppler-cairo.la \	17	$(top_builddir)/poppler/libpoppler-cairo.la \
18	$(POPPLER_GLIB_LIBS) \	18	$(POPPLER_GLIB_LIBS) \
19	$(FREETYPE_LIBS) \	19	$(FREETYPE_LIBS)
		20	@@ -576,7 +575,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
		21	@HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
		22	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
		23	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
		24	-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
		25	+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
		26	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
		27	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
		28	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib

Lines 1-101 Link Here

(-)poppler/files/patch-utils_Makefile.in (-60 / +64 lines)
1	--- utils/Makefile.in.orig 2014-11-25 11:49:19 UTC	1	--- utils/Makefile.in.orig 2014-11-04 18:46:22 UTC
2	+++ utils/Makefile.in	2	+++ utils/Makefile.in
3	@@ -111,7 +111,7 @@	3	@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)	4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)	5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
6	pdfdetach_LDADD = $(LDADD)	6	pdfdetach_LDADD = $(LDADD)
7	-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	7	-pdfdetach_DEPENDENCIES = libparseargs.la \
8	+pdfdetach_DEPENDENCIES =	8	- $(top_builddir)/poppler/libpoppler.la
9	AM_V_lt = $(am__v_lt_@AM_V@)	9	+pdfdetach_DEPENDENCIES = libparseargs.la
10	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)	10	am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
11	am__v_lt_0 = --silent
12	@@ -119,31 +119,31 @@
13	am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
14	pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)	11	pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
15	pdffonts_LDADD = $(LDADD)	12	pdffonts_LDADD = $(LDADD)
16	-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	13	-pdffonts_DEPENDENCIES = libparseargs.la \
17	+pdffonts_DEPENDENCIES =	14	- $(top_builddir)/poppler/libpoppler.la
		15	+pdffonts_DEPENDENCIES = libparseargs.la
18	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \	16	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
19	JSInfo.$(OBJEXT) $(am__objects_1)	17	JSInfo.$(OBJEXT)
20	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)	18	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
21	pdfimages_LDADD = $(LDADD)	19	pdfimages_LDADD = $(LDADD)
22	-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	20	-pdfimages_DEPENDENCIES = libparseargs.la \
23	+pdfimages_DEPENDENCIES =	21	- $(top_builddir)/poppler/libpoppler.la
		22	+pdfimages_DEPENDENCIES = libparseargs.la
24	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \	23	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
25	JSInfo.$(OBJEXT) $(am__objects_1)	24	JSInfo.$(OBJEXT)
26	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)	25	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
27	pdfinfo_LDADD = $(LDADD)	26	pdfinfo_LDADD = $(LDADD)
28	-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	27	-pdfinfo_DEPENDENCIES = libparseargs.la \
29	+pdfinfo_DEPENDENCIES =	28	- $(top_builddir)/poppler/libpoppler.la
30	am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)	29	+pdfinfo_DEPENDENCIES = libparseargs.la
		30	am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
31	pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)	31	pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
32	pdfseparate_LDADD = $(LDADD)	32	pdfseparate_LDADD = $(LDADD)
33	-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	33	-pdfseparate_DEPENDENCIES = libparseargs.la \
34	+pdfseparate_DEPENDENCIES =	34	- $(top_builddir)/poppler/libpoppler.la
35	am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h	35	+pdfseparate_DEPENDENCIES = libparseargs.la
36	@BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \	36	am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
37	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1)	37	pdftocairo-pdftocairo-win32.$(OBJEXT)
38	pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)	38	pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
39	-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la	39	-am__DEPENDENCIES_1 = libparseargs.la \
40	+am__DEPENDENCIES_1 =	40	- $(top_builddir)/poppler/libpoppler.la
		41	+am__DEPENDENCIES_1 = libparseargs.la
41	am__DEPENDENCIES_2 =	42	am__DEPENDENCIES_2 =
42	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \	43	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
43	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)	44	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
44	am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)	45	am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
45	-@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \	46	-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
46	+@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \	47	+pdftocairo_DEPENDENCIES = \
47	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) \	48	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
48	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_4) \	49	$(am__DEPENDENCIES_2)
49	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_2)	50	am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
50	@@ -153,7 +153,7 @@	51	@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
51	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)	52	pdftohtml-HtmlOutputDev.$(OBJEXT)
52	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)	53	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
53	pdftohtml_LDADD = $(LDADD)	54	pdftohtml_LDADD = $(LDADD)
54	-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	55	-pdftohtml_DEPENDENCIES = libparseargs.la \
55	+pdftohtml_DEPENDENCIES =	56	- $(top_builddir)/poppler/libpoppler.la
		57	+pdftohtml_DEPENDENCIES = libparseargs.la
56	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \	58	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
57	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \	59	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
58	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	60	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
59	@@ -162,20 +162,20 @@	61	am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
60	@BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1)
61	pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)	62	pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
62	pdftoppm_LDADD = $(LDADD)	63	pdftoppm_LDADD = $(LDADD)
63	-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	64	-pdftoppm_DEPENDENCIES = libparseargs.la \
64	+pdftoppm_DEPENDENCIES =	65	- $(top_builddir)/poppler/libpoppler.la
65	am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)	66	+pdftoppm_DEPENDENCIES = libparseargs.la
		67	am_pdftops_OBJECTS = pdftops.$(OBJEXT)
66	pdftops_OBJECTS = $(am_pdftops_OBJECTS)	68	pdftops_OBJECTS = $(am_pdftops_OBJECTS)
67	pdftops_LDADD = $(LDADD)	69	pdftops_LDADD = $(LDADD)
68	-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	70	-pdftops_DEPENDENCIES = libparseargs.la \
69	+pdftops_DEPENDENCIES =	71	- $(top_builddir)/poppler/libpoppler.la
70	am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \	72	+pdftops_DEPENDENCIES = libparseargs.la
71	$(am__objects_1)	73	am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
72	pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)	74	pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
73	pdftotext_LDADD = $(LDADD)	75	pdftotext_LDADD = $(LDADD)
74	-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	76	-pdftotext_DEPENDENCIES = libparseargs.la \
75	+pdftotext_DEPENDENCIES =	77	- $(top_builddir)/poppler/libpoppler.la
76	am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)	78	+pdftotext_DEPENDENCIES = libparseargs.la
		79	am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
77	pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)	80	pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
78	pdfunite_LDADD = $(LDADD)	81	pdfunite_LDADD = $(LDADD)
79	-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	82	-pdfunite_DEPENDENCIES = libparseargs.la \
80	+pdfunite_DEPENDENCIES =	83	- $(top_builddir)/poppler/libpoppler.la
		84	+pdfunite_DEPENDENCIES = libparseargs.la
81	AM_V_P = $(am__v_P_@AM_V@)	85	AM_V_P = $(am__v_P_@AM_V@)
82	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)	86	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
83	am__v_P_0 = false	87	am__v_P_0 = false
84	@@ -516,7 +516,7 @@	88	@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
85	$(PDFTOCAIRO_CFLAGS)
86		89
87	LDADD = \	90	LDADD = \
		91	libparseargs.la \
88	- $(top_builddir)/poppler/libpoppler.la \	92	- $(top_builddir)/poppler/libpoppler.la \
89	+ -lpoppler \	93	+ -lpoppler \
90	$(UTILS_LIBS)	94	$(UTILS_LIBS)
91		95
92	@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \	96	@BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
93	@@ -524,7 +524,7 @@	97	@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
94	@BUILD_CAIRO_OUTPUT_TRUE@ $(common)	98	pdftocairo-win32.h
95		99
96	@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \	100	pdftocairo_LDADD = \
97	-@BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \	101	- $(top_builddir)/poppler/libpoppler-cairo.la \
98	+@BUILD_CAIRO_OUTPUT_TRUE@ -lpoppler-glib \	102	+ -lpoppler-glib \
99	@BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) \	103	$(LDADD) \
100	@BUILD_CAIRO_OUTPUT_TRUE@ $(PDFTOCAIRO_LIBS) \	104	$(PDFTOCAIRO_LIBS) \
101	@BUILD_CAIRO_OUTPUT_TRUE@ $(PTHREAD_LIBS)	105	$(PTHREAD_LIBS)