print/poppler/patches/patch-ab

   1 $NetBSD$
   2
   3 --- utils/Makefile.in.orig      2011-01-27 19:32:04.000000000 +0000
   4 +++ utils/Makefile.in
   5 @@ -55,7 +55,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
   6         $(top_builddir)/poppler/poppler-config.h
   7  CONFIG_CLEAN_FILES =
   8  CONFIG_CLEAN_VPATH_FILES =
   9 -@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
  10 +am__EXEEXT_1 = pdftoppm$(EXEEXT)
  11  @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
  12  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  13  PROGRAMS = $(bin_PROGRAMS)
  14 @@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  15  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  16  pdffonts_LDADD = $(LDADD)
  17  am__DEPENDENCIES_1 =
  18 -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  19 +pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  20         $(am__DEPENDENCIES_1)
  21  AM_V_lt = $(am__v_lt_$(V))
  22  am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
  23 @@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
  24         $(am__objects_1)
  25  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  26  pdfimages_LDADD = $(LDADD)
  27 -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  28 +pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  29         $(am__DEPENDENCIES_1)
  30  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
  31         $(am__objects_1)
  32  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  33  pdfinfo_LDADD = $(LDADD)
  34 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  35 +pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  36         $(am__DEPENDENCIES_1)
  37  am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h
  38  @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
  39  @BUILD_ABIWORD_OUTPUT_TRUE@    $(am__objects_1)
  40  pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
  41 -am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
  42 +am__DEPENDENCIES_2 = $(prefix)/lib/libpoppler.la \
  43         $(am__DEPENDENCIES_1)
  44  @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
  45  @BUILD_ABIWORD_OUTPUT_TRUE@    $(am__DEPENDENCIES_2) \
  46 @@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
  47         HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  48  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  49  pdftohtml_LDADD = $(LDADD)
  50 -pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  51 +pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  52         $(am__DEPENDENCIES_1)
  53  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h
  54 -@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
  55 -@BUILD_SPLASH_OUTPUT_TRUE@     $(am__objects_1)
  56 +am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
  57 +       $(am__objects_1)
  58  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  59  pdftoppm_LDADD = $(LDADD)
  60 -pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  61 +pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  62         $(am__DEPENDENCIES_1)
  63  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  64  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  65  pdftops_LDADD = $(LDADD)
  66 -pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  67 +pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  68         $(am__DEPENDENCIES_1)
  69  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
  70         $(am__objects_1)
  71  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  72  pdftotext_LDADD = $(LDADD)
  73 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
  74 +pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  75         $(am__DEPENDENCIES_1)
  76  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  77  depcomp = $(SHELL) $(top_srcdir)/depcomp
  78 @@ -389,12 +389,12 @@ top_build_prefix = @top_build_prefix@
  79  top_builddir = @top_builddir@
  80  top_srcdir = @top_srcdir@
  81  win32_libs = @win32_libs@
  82 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
  83 -@BUILD_SPLASH_OUTPUT_TRUE@     pdftoppm.cc                             \
  84 -@BUILD_SPLASH_OUTPUT_TRUE@     $(common)
  85 +pdftoppm_SOURCES = \
  86 +       pdftoppm.cc                             \
  87 +       $(common)
  88
  89 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm
  90 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
  91 +pdftoppm_binary = pdftoppm
  92 +pdftoppm_manpage = pdftoppm.1
  93  INCLUDES = \
  94         -I$(top_srcdir)                         \
  95         -I$(top_srcdir)/goo                     \
  96 @@ -405,9 +405,10 @@ INCLUDES = \
  97         $(ABIWORD_CFLAGS)
  98
  99  LDADD = \
 100 -       $(top_builddir)/poppler/libpoppler.la   \
 101 +       $(prefix)/lib/libpoppler.la     \
 102         $(UTILS_LIBS)                           \
 103 -       $(FONTCONFIG_LIBS)
 104 +       $(FONTCONFIG_LIBS) \
 105 +       $(PTHREAD_STUBLIB)
 106
 107  @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
 108  @BUILD_ABIWORD_OUTPUT_TRUE@    pdftoabw.cc                             \