From a4cf673a3347ec011ebc90b22b6541bae0b9f6b4 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Wed, 22 Dec 2004 00:44:41 +0000
Subject: Switch from .a to libtool convenience libraries.

Tue Dec 21 19:28:55 2004  Owen Taylor  <otaylor@redhat.com>

        * pdf/{goo,fofi,splash,xpdf}/Makefile.am: Switch from
        .a to libtool convenience libraries.

        * shell/ev-window.c (ev_window_open): Hard code loading
        a PDF document.

        * backend/ev-document.h: Add a boolean return to load(),
        fix GError * to GError **.

        * pdf/xpdf/pdf-document.[ch] Makefile.am: Add a stub
        object for a PDF backend EvDocument.
---
(limited to 'shell/Makefile.am')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7179a7d..891eadb 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -3,6 +3,8 @@ NULL=
 INCLUDES=					\
 	-DDATADIR=\"$(pkgdatadir)\"		\
 	-I$(top_srcdir)/lib			\
+	-I$(top_srcdir)/backend			\
+	-I$(top_srcdir)/pdf/xpdf		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	$(SHELL_CFLAGS)				\
 	$(EVINCE_DISABLE_DEPRECATED)		\
@@ -22,6 +24,8 @@ evince_SOURCES=				\
 	main.c				\
 	$(NULL)
 
-evince_LDADD=					\
-	$(SHELL_LIBS)				\
+evince_LDADD=						\
+	$(SHELL_LIBS)					\
+	$(top_builddir)/backend/libevbackend.la		\
+	$(top_builddir)/pdf/xpdf/libpdfdocument.la 	\
 	$(NULL)
--
cgit v0.9.1