From 02383ed04e6a5c215d6d3d4b961bc73b58a23b37 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 06 Jul 2005 23:05:39 +0000 Subject: This should solve the circular dep without requiring dir reorg! 2005-07-07 Marco Pesenti Gritti * Makefile.am: * backend/Makefile.am: * properties/Makefile.am: * shell/Makefile.am: * thumbnailer/Makefile.am: This should solve the circular dep without requiring dir reorg! * shell/ev-window.c: (setup_view_from_metadata): Never restore window size/position when the window is already visible. --- (limited to 'shell/Makefile.am') diff --git a/shell/Makefile.am b/shell/Makefile.am index 24e3ab6..80b6ea5 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -20,34 +20,6 @@ INCLUDES += $(DBUS_CFLAGS) endif bin_PROGRAMS=evince -noinst_LTLIBRARIES = libevbackendfactory.la - -libevbackendfactory_la_SOURCES = - -libevbackendfactory_la_LIBADD = \ - $(top_builddir)/pdf/libpdfdocument.la \ - $(top_builddir)/pixbuf/libpixbufdocument.la \ - $(top_builddir)/ps/libgtkgs.la \ - $(top_builddir)/backend/libevbackend.la \ - $(NULL) - -if ENABLE_DJVU -libevbackendfactory_la_LIBADD += \ - $(top_builddir)/djvu/libgtkdjvu.la \ - $(NULL) -endif - -if ENABLE_TIFF -libevbackendfactory_la_LIBADD += \ - $(top_builddir)/tiff/libtiffdocument.la \ - $(NULL) -endif - -if ENABLE_DVI -libevbackendfactory_la_LIBADD += \ - $(top_builddir)/dvi/libgtkdvi.la \ - $(NULL) -endif evince_SOURCES= \ dummy.cc \ @@ -116,8 +88,8 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/lib/libev.la \ + $(top_builddir)/backend/libevbackend.la \ -ltiff -lz \ - libevbackendfactory.la \ $(NULL) if ENABLE_DBUS -- cgit v0.9.1