This should solve the circular dep without requiring dir reorg!

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index e4010a93d776b7dc68172192b7d25ad2f860175f..80b6ea50fca29d1ba961df017e8f59843a95c688 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -8,13 +8,7 @@ INCLUDES=                                              \
        -I$(top_srcdir)/cut-n-paste/zoom-control/       \
        -I$(top_srcdir)/cut-n-paste/toolbar-editor/     \
        -I$(top_srcdir)/backend                         \
-       -I$(top_srcdir)/pdf                             \
-       -I$(top_srcdir)/pixbuf                          \
        -I$(top_srcdir)/properties                      \
-       -I$(top_srcdir)/tiff                            \
-       -I$(top_srcdir)/ps                              \
-       -I$(top_srcdir)/djvu                            \
-       -I$(top_srcdir)/dvi                             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"         \
        $(SHELL_CFLAGS)                                 \
@@ -26,36 +20,6 @@ INCLUDES += $(DBUS_CFLAGS)
 endif
 
 bin_PROGRAMS=evince
-noinst_LTLIBRARIES = libevbackendfactory.la
-
-libevbackendfactory_la_SOURCES=                        \
-       ev-document-types.c                             \
-       ev-document-types.h
-
-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                        \
@@ -63,6 +27,8 @@ evince_SOURCES=                               \
        eggfindbar.h                    \
        ev-application.c                \
        ev-application.h                \
+       ev-document-types.c             \
+       ev-document-types.h             \
        ev-job-queue.h                  \
        ev-job-queue.c                  \
        ev-jobs.h                       \
@@ -122,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
@@ -136,7 +102,8 @@ if ENABLE_DBUS
 BUILT_SOURCES += ev-application-service.h
 endif
 
-EXTRA_DIST = ev-marshal.list
+EXTRA_DIST = ev-marshal.list \
+            ev-application-service.h
 
 ev-marshal.h: ev-marshal.list
        glib-genmarshal --prefix=ev_marshal ev-marshal.list --header > ev-marshal.h
@@ -145,5 +112,10 @@ ev-marshal.c: ev-marshal.list
        echo '#include "ev-marshal.h"' > ev-marshal.c
        glib-genmarshal --prefix=ev_marshal ev-marshal.list --body >> ev-marshal.c
 
+if DBUS_TOOL_NO_PREFIX
 ev-application-service.h: ev-application-service.xml
        dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+else
+ev-application-service.h: ev-application-service.xml
+       dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+endif