99 lines
3.9 KiB
Text
99 lines
3.9 KiB
Text
--- utils/Makefile.in.orig 2012-02-22 16:52:39.000000000 +0100
|
|
+++ utils/Makefile.in 2012-02-22 16:56:09.000000000 +0100
|
|
@@ -67,7 +67,7 @@
|
|
pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
|
|
pdffonts_LDADD = $(LDADD)
|
|
am__DEPENDENCIES_1 =
|
|
-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
|
|
+pdffonts_DEPENDENCIES = \
|
|
$(am__DEPENDENCIES_1)
|
|
AM_V_lt = $(am__v_lt_$(V))
|
|
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
|
|
@@ -76,59 +76,59 @@
|
|
$(am__objects_1)
|
|
pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
|
|
pdfimages_LDADD = $(LDADD)
|
|
-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
|
|
+pdfimages_DEPENDENCIES = \
|
|
$(am__DEPENDENCIES_1)
|
|
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 = \
|
|
$(am__DEPENDENCIES_1)
|
|
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 = \
|
|
$(am__DEPENDENCIES_1)
|
|
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_2 = $(top_builddir)/poppler/libpoppler.la \
|
|
+am__DEPENDENCIES_2 = \
|
|
$(am__DEPENDENCIES_1)
|
|
@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
|
|
@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_1)
|
|
am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
|
|
-@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
|
|
+@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \
|
|
@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) \
|
|
@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_4)
|
|
am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
|
|
HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
|
|
pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
|
|
pdftohtml_LDADD = $(LDADD)
|
|
-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
|
|
+pdftohtml_DEPENDENCIES = \
|
|
$(am__DEPENDENCIES_1)
|
|
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)
|
|
pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
|
|
pdftoppm_LDADD = $(LDADD)
|
|
-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
|
|
+pdftoppm_DEPENDENCIES = \
|
|
$(am__DEPENDENCIES_1)
|
|
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 = \
|
|
$(am__DEPENDENCIES_1)
|
|
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 = \
|
|
$(am__DEPENDENCIES_1)
|
|
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 = \
|
|
$(am__DEPENDENCIES_1)
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
@@ -419,7 +419,7 @@
|
|
$(PDFTOCAIRO_CFLAGS)
|
|
|
|
LDADD = \
|
|
- $(top_builddir)/poppler/libpoppler.la \
|
|
+ -lpoppler \
|
|
$(UTILS_LIBS) \
|
|
$(FONTCONFIG_LIBS)
|
|
|
|
@@ -428,7 +428,7 @@
|
|
@BUILD_CAIRO_OUTPUT_TRUE@ $(common)
|
|
|
|
@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \
|
|
-@BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \
|
|
+@BUILD_CAIRO_OUTPUT_TRUE@ -lpoppler-glib \
|
|
@BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) $(PDFTOCAIRO_LIBS)
|
|
|
|
@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo
|