catch another gtk+-2.8ism Make work with gtk+-2.6 Release 0.4.0

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8b6cd7d71288e27689f1166df4f3f1c3afcdca09..ae0129017df89dcc4889b2e34a215f0b9fb0ce84 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -30,6 +30,8 @@ evince_SOURCES=                               \
        ev-job-xfer.h                   \
        ev-marshal.c                    \
        ev-marshal.h                    \
+       ev-metadata-manager.c           \
+       ev-metadata-manager.h           \
        ev-page-action.c                \
        ev-page-action.h                \
        ev-page-cache.h                 \
@@ -66,12 +68,6 @@ evince_SOURCES=                              \
        ev-stock-icons.h                \
        main.c
 
-if ENABLE_METADATA
-evince_SOURCES += \
-       ev-metadata-manager.h           \
-       ev-metadata-manager.c
-endif
-
 evince_LDADD=                                                          \
        $(SHELL_LIBS)                                                   \
        $(top_builddir)/cut-n-paste/recent-files/librecent.la           \
@@ -86,8 +82,9 @@ if ENABLE_DBUS
 BUILT_SOURCES += ev-application-service.h
 endif
 
-EXTRA_DIST = ev-marshal.list \
-            ev-application-service.h
+EXTRA_DIST = ev-marshal.list           \
+       ev-application-service.xml
+
 
 ev-marshal.h: ev-marshal.list
        glib-genmarshal --prefix=ev_marshal ev-marshal.list --header > ev-marshal.h
@@ -96,10 +93,13 @@ 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
 
+DISTCLEANFILES= \
+       ev-application-service.h
+
 if DBUS_TOOL_NO_PREFIX
-ev-application-service.h: ev-application-service.xml
+ev-application-service.h: $(srcdir)/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
+ev-application-service.h: $(srcdir)/ev-application-service.xml
        dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
 endif