--- 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) 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) 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 = \ 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)