X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2FMakefile.am;h=4230dbb80cdeae7b993fa670a4a2837035d67d73;hb=116cc32fa10941e73faa84697d33efd5c75ba7f7;hp=b1dafd7a20f1e5e6da9f83770bf87a580b7eb2d1;hpb=7f94a4075450791807ee2699cb0e7a0293ccc2f3;p=evince.git diff --git a/shell/Makefile.am b/shell/Makefile.am index b1dafd7a..4230dbb8 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,6 +1,8 @@ INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/cut-n-paste/zoom-control/ \ -I$(top_srcdir)/cut-n-paste/toolbar-editor/ \ -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ @@ -9,9 +11,13 @@ INCLUDES= \ -I$(top_srcdir)/cut-n-paste/evmountoperation/ \ -I$(top_srcdir)/cut-n-paste/smclient/ \ -I$(top_srcdir)/libdocument \ + -I$(top_builddir)/libdocument \ + -I$(top_srcdir)/libview \ + -I$(top_builddir)/libview \ -I$(top_srcdir)/properties \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \ + -DEVINCE_COMPILATION \ $(SHELL_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -30,14 +36,12 @@ evince_SOURCES= \ eggfindbar.h \ ev-application.c \ ev-application.h \ - ev-job-scheduler.h \ - ev-job-scheduler.c \ - ev-jobs.h \ - ev-jobs.c \ ev-file-monitor.h \ ev-file-monitor.c \ ev-history.c \ ev-history.h \ + ev-keyring.h \ + ev-keyring.c \ ev-marshal.c \ ev-marshal.h \ $(DBUS_SOURCES) \ @@ -53,14 +57,12 @@ evince_SOURCES= \ ev-page-action.h \ ev-page-action-widget.c \ ev-page-action-widget.h \ - ev-page-cache.h \ - ev-page-cache.c \ - ev-password.h \ - ev-password.c \ ev-password-view.h \ ev-password-view.c \ - ev-pixbuf-cache.c \ - ev-pixbuf-cache.h \ + ev-print-operation.h \ + ev-print-operation.c \ + ev-progress-message-area.h \ + ev-progress-message-area.c \ ev-properties-dialog.c \ ev-properties-dialog.h \ ev-properties-fonts.c \ @@ -69,11 +71,6 @@ evince_SOURCES= \ ev-open-recent-action.h \ ev-utils.c \ ev-utils.h \ - ev-view-accessible.c \ - ev-view-accessible.h \ - ev-view-private.h \ - ev-view.c \ - ev-view.h \ ev-window.c \ ev-window.h \ ev-window-title.c \ @@ -92,10 +89,6 @@ evince_SOURCES= \ ev-sidebar-thumbnails.h \ ev-stock-icons.c \ ev-stock-icons.h \ - ev-timeline.c \ - ev-timeline.h \ - ev-transition-animation.c \ - ev-transition-animation.h \ main.c evince_LDADD= \ @@ -107,7 +100,8 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/evmountoperation/libevmountoperation.la \ $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ $(top_builddir)/properties/libevproperties.la \ - $(top_builddir)/libdocument/libevbackend.la \ + $(top_builddir)/libdocument/libevdocument.la \ + $(top_builddir)/libview/libevview.la \ $(SHELL_LIBS) BUILT_SOURCES = ev-marshal.h ev-marshal.c