Attachment #144916 for bug #192068




#   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $

PORTNAME=	poppler
PORTVERSION=	0.26.3
PORTREVISION?=	0
CATEGORIES=	graphics print
MASTER_SITES=	http://poppler.freedesktop.org/


COMMENT?=	PDF rendering library

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
		libpng15.so:${PORTSDIR}/graphics/png \
		libtiff.so:${PORTSDIR}/graphics/tiff \
		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
		libfreetype.so:${PORTSDIR}/print/freetype2
RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data

USES=		gmake libtool pathfix pkgconfig tar:xz
USES=		gmake libtool:keepla pathfix pkgconfig
USE_GNOME=	libxml2
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

CONFIGURE_ARGS=	--enable-zlib \
		--enable-xpdf-headers \
		--disable-gtk-test \
		--without-html-dir
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib


# see https://bugs.freedesktop.org/show_bug.cgi?id=72499
CPPFLAGS+=	 -D__LONG_LONG_SUPPORTED

INSTALL_TARGET=	install-strip

.if !defined(SLAVEPORT)
PORTSCOUT=	limitw:1,even

OPTIONS_DEFINE=	CAIRO CURL OPENJPEG
OPTIONS_DEFAULT=CAIRO OPENJPEG

USES+=		iconv

LIB_DEPENDS+=	libpoppler.so:${PORTSDIR}/graphics/poppler

.if ${SLAVEPORT}==glib
CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
USE_GNOME+=	cairo gnomehier glib20 introspection:build
BUILD_WRKSRC=	${WRKSRC}/glib
INSTALL_WRKSRC=	${WRKSRC}/glib

CONFIGURE_ARGS+=--disable-poppler-qt4
.endif

# needs checking when Qt5 is available
.if ${SLAVEPORT}==qt5
CONFIGURE_ARGS+=--enable-poppler-qt5
CONFIGURE_ENV+=	ac_cv_prog_MOCQT5=${MOC}
USE_QT5=	buildtools core gui testlib widgets xml
BUILD_WRKSRC=	${WRKSRC}/qt5
INSTALL_WRKSRC=	${WRKSRC}/qt5
.else

PLIST_SUB+=	CAIRO="@comment "
.endif

.if ${PORT_OPTIONS:MCURL}
LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--enable-libcurl
PLIST_SUB+=	CURL=""
.else
CONFIGURE_ARGS+=--disable-libcurl
PLIST_SUB+=	CURL="@comment "
.endif

.if ${PORT_OPTIONS:MOPENJPEG}
CONFIGURE_ARGS+=--enable-libopenjpeg
LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15

		${WRKSRC}/configure
.endif
.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5
	@${REINPLACE_CMD} -e 's|MOCQT5=`.*|MOCQT5="${MOC}"|' \
		${WRKSRC}/configure
.endif


		${STAGEDIR}${PREFIX}/libdata/pkgconfig
. endif
.endif
	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpoppler*.so.*

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (poppler-0.24.5.tar.xz) = a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84	1	SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1
2	SIZE (poppler-0.24.5.tar.xz) = 1512476	2	SIZE (poppler-0.26.3.tar.xz) = 1593760

Line 0 Link Here

(-)files/patch-qt5__Makefile.in (+11 lines)
	1	--- ./qt5/Makefile.in.orig 2014-07-20 16:22:04.000000000 +0000
	2	+++ ./qt5/Makefile.in 2014-07-22 22:09:00.000000000 +0000
	3	@@ -384,7 +384,7 @@
	4	top_builddir = @top_builddir@
	5	top_srcdir = @top_srcdir@
	6	win32_libs = @win32_libs@
	7	-SUBDIRS = src tests demos
	8	+SUBDIRS = src
	9	all: all-recursive
	10
	11	.SUFFIXES:




--- ./qt5/src/Makefile.in.orig	2014-07-20 16:22:04.000000000 +0000
+++ ./qt5/src/Makefile.in	2014-07-22 22:12:19.000000000 +0000
@@ -129,7 +129,7 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libpoppler_qt5_la_DEPENDENCIES =  \
-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
 	libpoppler_qt5_la-poppler-page.lo \
 	libpoppler_qt5_la-poppler-fontinfo.lo \
@@ -505,7 +505,7 @@
 	-Dpoppler_qt5_EXPORTS -fPIC
 
 libpoppler_qt5_la_LIBADD = \
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler	\
 	$(POPPLER_QT5_LIBS)
 
 libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@




--- ./utils/Makefile.in.orig	2014-07-20 16:22:05.000000000 +0000
+++ ./utils/Makefile.in	2014-07-21 19:54:18.000000000 +0000
@@ -111,7 +111,7 @@
 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)

-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdffonts_DEPENDENCIES =
 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
 	JSInfo.$(OBJEXT) $(am__objects_1)
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
 pdfimages_LDADD = $(LDADD)
-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfimages_DEPENDENCIES =
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
 	JSInfo.$(OBJEXT) $(am__objects_1)
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
 pdfinfo_LDADD = $(LDADD)
-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la

 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
 pdftohtml_LDADD = $(LDADD)
-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdftohtml_DEPENDENCIES =
 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

Lines 8-13 Link Here

(-)pkg-plist (-7 / +11 lines)
8	include/poppler/CharCodeToUnicode.h	8	include/poppler/CharCodeToUnicode.h
9	include/poppler/CharTypes.h	9	include/poppler/CharTypes.h
10	include/poppler/CompactFontTables.h	10	include/poppler/CompactFontTables.h
		11	%%CURL%%include/poppler/CurlCachedFile.h
		12	%%CURL%%include/poppler/CurlPDFDocBuilder.h
11	include/poppler/DateInfo.h	13	include/poppler/DateInfo.h
12	include/poppler/Decrypt.h	14	include/poppler/Decrypt.h
13	include/poppler/Dict.h	15	include/poppler/Dict.h
Lines 30-35 Link Here
30	include/poppler/Linearization.h	32	include/poppler/Linearization.h
31	include/poppler/Link.h	33	include/poppler/Link.h
32	include/poppler/LocalPDFDocBuilder.h	34	include/poppler/LocalPDFDocBuilder.h
		35	include/poppler/MarkedContentOutputDev.h
33	include/poppler/Movie.h	36	include/poppler/Movie.h
34	include/poppler/NameToCharCode.h	37	include/poppler/NameToCharCode.h
35	include/poppler/NameToUnicodeTable.h	38	include/poppler/NameToUnicodeTable.h
Lines 57-62 Link Here
57	include/poppler/StdinPDFDocBuilder.h	60	include/poppler/StdinPDFDocBuilder.h
58	include/poppler/Stream-CCITT.h	61	include/poppler/Stream-CCITT.h
59	include/poppler/Stream.h	62	include/poppler/Stream.h
		63	include/poppler/StructElement.h
		64	include/poppler/StructTreeRoot.h
60	include/poppler/TextOutputDev.h	65	include/poppler/TextOutputDev.h
61	include/poppler/UTF.h	66	include/poppler/UTF.h
62	include/poppler/UTF8.h	67	include/poppler/UTF8.h
Lines 95-100 Link Here
95	include/poppler/goo/GooTimer.h	100	include/poppler/goo/GooTimer.h
96	include/poppler/goo/ImgWriter.h	101	include/poppler/goo/ImgWriter.h
97	include/poppler/goo/JpegWriter.h	102	include/poppler/goo/JpegWriter.h
		103	include/poppler/goo/NetPBMWriter.h
98	include/poppler/goo/PNGWriter.h	104	include/poppler/goo/PNGWriter.h
99	include/poppler/goo/TiffWriter.h	105	include/poppler/goo/TiffWriter.h
100	include/poppler/goo/gfile.h	106	include/poppler/goo/gfile.h
Lines 127-147 Link Here
127	include/poppler/splash/SplashXPath.h	133	include/poppler/splash/SplashXPath.h
128	include/poppler/splash/SplashXPathScanner.h	134	include/poppler/splash/SplashXPathScanner.h
129	lib/libpoppler-cpp.a	135	lib/libpoppler-cpp.a
130	lib/libpoppler-cpp.la
131	lib/libpoppler-cpp.so	136	lib/libpoppler-cpp.so
132	lib/libpoppler-cpp.so.0	137	lib/libpoppler-cpp.so.0
133	lib/libpoppler-cpp.so.0.2.0	138	lib/libpoppler-cpp.so.0.2.0
134	lib/libpoppler.a	139	lib/libpoppler.a
135	lib/libpoppler.la
136	lib/libpoppler.so	140	lib/libpoppler.so
137	lib/libpoppler.so.44	141	lib/libpoppler.so.46
138	lib/libpoppler.so.44.0.0	142	lib/libpoppler.so.46.0.0
139	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc	143	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
140	libdata/pkgconfig/poppler-cpp.pc	144	libdata/pkgconfig/poppler-cpp.pc
141	libdata/pkgconfig/poppler-splash.pc	145	libdata/pkgconfig/poppler-splash.pc
142	libdata/pkgconfig/poppler.pc	146	libdata/pkgconfig/poppler.pc
		147	@dirrm include/poppler/cpp
		148	@dirrm include/poppler/fofi
		149	@dirrm include/poppler/goo
143	@dirrm include/poppler/splash	150	@dirrm include/poppler/splash
144	@dirrm include/poppler/goo
145	@dirrm include/poppler/fofi
146	@dirrm include/poppler/cpp
147	@dirrm include/poppler	151	@dirrm include/poppler

Return to bug 192068

Lines 3-10 Link Here

(-)Makefile (-13 / +25 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.24.5	6	PORTVERSION= 0.26.3
7	PORTREVISION?= 4	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 12-25 Link Here
12	COMMENT?= PDF rendering library	12	COMMENT?= PDF rendering library
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
		15	LICENSE_FILE= ${WRKSRC}/COPYING
15		16
16	LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \	17	LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
		18	libpng15.so:${PORTSDIR}/graphics/png \
		19	libtiff.so:${PORTSDIR}/graphics/tiff \
17	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \	20	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
18	liblcms2.so:${PORTSDIR}/graphics/lcms2	21	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
		22	libfreetype.so:${PORTSDIR}/print/freetype2
19	RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data	23	RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
20		24
21	USE_XZ= yes	25	USES= gmake libtool pathfix pkgconfig tar:xz
22	USES= gmake libtool:keepla pathfix pkgconfig
23	USE_GNOME= libxml2	26	USE_GNOME= libxml2
24	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
25	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
Lines 26-32 Link Here
26	CONFIGURE_ARGS= --enable-zlib \	29	CONFIGURE_ARGS= --enable-zlib \
27	--enable-xpdf-headers \	30	--enable-xpdf-headers \
28	--disable-gtk-test \	31	--disable-gtk-test \
29	--with-html-dir=${DOCSDIR}	32	--without-html-dir
30	CPPFLAGS+= -I${LOCALBASE}/include	33	CPPFLAGS+= -I${LOCALBASE}/include
31	LDFLAGS+= -L${LOCALBASE}/lib	34	LDFLAGS+= -L${LOCALBASE}/lib
32		35
Lines 33-42 Link Here
33	# see https://bugs.freedesktop.org/show_bug.cgi?id=72499	36	# see https://bugs.freedesktop.org/show_bug.cgi?id=72499
34	CPPFLAGS+= -D__LONG_LONG_SUPPORTED	37	CPPFLAGS+= -D__LONG_LONG_SUPPORTED
35		38
		39	INSTALL_TARGET= install-strip
		40
36	.if !defined(SLAVEPORT)	41	.if !defined(SLAVEPORT)
37	PORTSCOUT= limitw:1,even	42	PORTSCOUT= limitw:1,even
38		43
39	OPTIONS_DEFINE= CAIRO OPENJPEG	44	OPTIONS_DEFINE= CAIRO CURL OPENJPEG
40	OPTIONS_DEFAULT=CAIRO OPENJPEG	45	OPTIONS_DEFAULT=CAIRO OPENJPEG
41		46
42	USES+= iconv	47	USES+= iconv
Lines 49-55 Link Here
49	LIB_DEPENDS+= libpoppler.so:${PORTSDIR}/graphics/poppler	54	LIB_DEPENDS+= libpoppler.so:${PORTSDIR}/graphics/poppler
50		55
51	.if ${SLAVEPORT}==glib	56	.if ${SLAVEPORT}==glib
52	CONFIGURE_ARGS+=--enable-poppler-glib	57	CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
53	USE_GNOME+= cairo gnomehier glib20 introspection:build	58	USE_GNOME+= cairo gnomehier glib20 introspection:build
54	BUILD_WRKSRC= ${WRKSRC}/glib	59	BUILD_WRKSRC= ${WRKSRC}/glib
55	INSTALL_WRKSRC= ${WRKSRC}/glib	60	INSTALL_WRKSRC= ${WRKSRC}/glib
Lines 67-77 Link Here
67	CONFIGURE_ARGS+=--disable-poppler-qt4	72	CONFIGURE_ARGS+=--disable-poppler-qt4
68	.endif	73	.endif
69		74
70	# needs checking when Qt5 is available
71	.if ${SLAVEPORT}==qt5	75	.if ${SLAVEPORT}==qt5
72	CONFIGURE_ARGS+=--enable-poppler-qt5	76	CONFIGURE_ARGS+=--enable-poppler-qt5
73	CONFIGURE_ENV+= ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt5	77	CONFIGURE_ENV+= ac_cv_prog_MOCQT5=${MOC}
74	USE_QT5= gui corelib xml qtestlib moc_build	78	USE_QT5= buildtools core gui testlib widgets xml
75	BUILD_WRKSRC= ${WRKSRC}/qt5	79	BUILD_WRKSRC= ${WRKSRC}/qt5
76	INSTALL_WRKSRC= ${WRKSRC}/qt5	80	INSTALL_WRKSRC= ${WRKSRC}/qt5
77	.else	81	.else
Lines 101-106 Link Here
101	PLIST_SUB+= CAIRO="@comment "	105	PLIST_SUB+= CAIRO="@comment "
102	.endif	106	.endif
103		107
		108	.if ${PORT_OPTIONS:MCURL}
		109	LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
		110	CONFIGURE_ARGS+=--enable-libcurl
		111	PLIST_SUB+= CURL=""
		112	.else
		113	CONFIGURE_ARGS+=--disable-libcurl
		114	PLIST_SUB+= CURL="@comment "
		115	.endif
		116
104	.if ${PORT_OPTIONS:MOPENJPEG}	117	.if ${PORT_OPTIONS:MOPENJPEG}
105	CONFIGURE_ARGS+=--enable-libopenjpeg	118	CONFIGURE_ARGS+=--enable-libopenjpeg
106	LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15	119	LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
Lines 117-123 Link Here
117	${WRKSRC}/configure	130	${WRKSRC}/configure
118	.endif	131	.endif
119	.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5	132	.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5
120	@${REINPLACE_CMD} -e 's\|MOCQT5=`.*\|MOCQT5="${LOCALBASE}/bin/moc-qt5"\|' \	133	@${REINPLACE_CMD} -e 's\|MOCQT5=`.*\|MOCQT5="${MOC}"\|' \
121	${WRKSRC}/configure	134	${WRKSRC}/configure
122	.endif	135	.endif
123		136
Lines 134-139 Link Here
134	${STAGEDIR}${PREFIX}/libdata/pkgconfig	147	${STAGEDIR}${PREFIX}/libdata/pkgconfig
135	. endif	148	. endif
136	.endif	149	.endif
137	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpoppler.so.
138		150
139	.include <bsd.port.mk>	151	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-qt5__src__Makefile.in (+20 lines)
	1	--- ./qt5/src/Makefile.in.orig 2014-07-20 16:22:04.000000000 +0000
	2	+++ ./qt5/src/Makefile.in 2014-07-22 22:12:19.000000000 +0000
	3	@@ -129,7 +129,7 @@
	4	LTLIBRARIES = $(lib_LTLIBRARIES)
	5	am__DEPENDENCIES_1 =
	6	libpoppler_qt5_la_DEPENDENCIES = \
	7	- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
	8	+ $(am__DEPENDENCIES_1)
	9	am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
	10	libpoppler_qt5_la-poppler-page.lo \
	11	libpoppler_qt5_la-poppler-fontinfo.lo \
	12	@@ -505,7 +505,7 @@
	13	-Dpoppler_qt5_EXPORTS -fPIC
	14
	15	libpoppler_qt5_la_LIBADD = \
	16	- $(top_builddir)/poppler/libpoppler.la \
	17	+ -lpoppler \
	18	$(POPPLER_QT5_LIBS)
	19
	20	libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@

Lines 1-5 Link Here

(-)files/patch-utils_Makefile.in (-5 / +5 lines)
1	--- utils/Makefile.in.orig 2013-12-02 19:00:03.000000000 +0100	1	--- ./utils/Makefile.in.orig 2014-07-20 16:22:05.000000000 +0000
2	+++ utils/Makefile.in 2013-12-02 19:01:25.000000000 +0100	2	+++ ./utils/Makefile.in 2014-07-21 19:54:18.000000000 +0000
3	@@ -111,7 +111,7 @@	3	@@ -111,7 +111,7 @@
4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)	4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)	5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
Lines 16-28 Link Here
16	-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	16	-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
17	+pdffonts_DEPENDENCIES =	17	+pdffonts_DEPENDENCIES =
18	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \	18	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
19	$(am__objects_1)	19	JSInfo.$(OBJEXT) $(am__objects_1)
20	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)	20	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
21	pdfimages_LDADD = $(LDADD)	21	pdfimages_LDADD = $(LDADD)
22	-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	22	-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
23	+pdfimages_DEPENDENCIES =	23	+pdfimages_DEPENDENCIES =
24	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \	24	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
25	$(am__objects_1)	25	JSInfo.$(OBJEXT) $(am__objects_1)
26	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)	26	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
27	pdfinfo_LDADD = $(LDADD)	27	pdfinfo_LDADD = $(LDADD)
28	-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	28	-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
Lines 52-58 Link Here
52	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)	52	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
53	pdftohtml_LDADD = $(LDADD)	53	pdftohtml_LDADD = $(LDADD)
54	-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	54	-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
55	+pdftohtml_DEPENDENCIES =	55	+pdftohtml_DEPENDENCIES =
56	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \	56	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
57	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \	57	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
58	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	58	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@