From 02eb16fef45712a91e24f6471b9e2f31249c888e Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Tue, 01 Mar 2005 22:24:10 +0000
Subject: Use poppler instead of including xpdf source code. Poppler is a fork of

2005-03-01  Kristian Høgsberg  <krh@redhat.com>

        Use poppler instead of including xpdf source code.  Poppler is a
        fork of xpdf to build it as a shared library. See
        http://freedesktop.org/wiki/Software/poppler.

        * pdf/xpdf/*, pdf/goo/*, pdf/splash/*, pdf/fofi/*: Remove included
        xpdf fork.

        * pdf/Makefile.am: Build libpdfdocument.a here.

        * pdf/GDKSplashOutputDev.cc:
        * pdf/GDKSplashOutputDev.h:
        * pdf/GnomeVFSStream.cc:
        * pdf/GnomeVFSStream.h:
        * pdf-document.cc:
        * pdf-document.h:
        * test-gdk-output-dev.cc
        * Thumb.cc:
        * Thumb.h: Pull these files out of pdf/xpdf and adjust to compile
        against poppler.
---
(limited to 'shell')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 40748c9..0ae0958 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES=					\
 	-DDATADIR=\"$(pkgdatadir)\"		\
 	-I$(top_srcdir)/lib			\
 	-I$(top_srcdir)/backend			\
-	-I$(top_srcdir)/pdf/xpdf		\
+	-I$(top_srcdir)/pdf			\
 	-I$(top_srcdir)/pixbuf			\
 	-I$(top_srcdir)/ps	                \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
@@ -51,7 +51,7 @@ evince_SOURCES=				\
 evince_LDADD=						\
 	$(SHELL_LIBS)					\
 	$(top_builddir)/lib/libev.la			\
-	$(top_builddir)/pdf/xpdf/libpdfdocument.la 	\
+	$(top_builddir)/pdf/libpdfdocument.la	 	\
 	$(top_builddir)/pixbuf/libpixbufdocument.la	\
 	$(top_builddir)/ps/libgtkgs.la			\
 	$(top_builddir)/backend/libevbackend.la		\
--
cgit v0.9.1