[build] Rename DATADIR with EVINCEDATADIR

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index c801b7819a261c964032a5382c0c931651d19598..d5c5010154a4a11b7a3dac7a9623168990ff74d3 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=                                                      \
-       -DDATADIR=\"$(pkgdatadir)\"                             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"                               \
        -DGNOMEDATADIR=\"$(datadir)\"                           \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)                                       \
@@ -14,7 +14,6 @@ INCLUDES=                                                     \
        -I$(top_builddir)/libview                               \
        -I$(top_srcdir)/libmisc                                 \
        -I$(top_srcdir)/properties                              \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"                  \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"                 \
        -DBINDIR=\""$(bindir)"\"                                \
        -DLIBEXECDIR=\""$(libexecdir)"\"                        \
@@ -30,16 +29,11 @@ if ENABLE_DBUS
 libexec_PROGRAMS += evinced
 endif
 
-EV_MEDIA_PLAYER_KEYS_SOURCES = ev-media-player-keys.c ev-media-player-keys.h
-if ENABLE_DBUS
-DBUS_SOURCES = $(EV_MEDIA_PLAYER_KEYS_SOURCES)
-else
-DBUS_SOURCES = $(null)
-endif
-
 evince_SOURCES=                                \
        eggfindbar.c                    \
        eggfindbar.h                    \
+       ev-annotation-properties-dialog.h \
+       ev-annotation-properties-dialog.c \
        ev-application.c                \
        ev-application.h                \
        ev-file-monitor.h               \
@@ -50,7 +44,6 @@ evince_SOURCES=                               \
        ev-keyring.c                    \
        ev-marshal.c                    \
        ev-marshal.h                    \
-       $(DBUS_SOURCES)                 \
        ev-message-area.c               \
        ev-message-area.h               \
        ev-metadata.c                   \
@@ -79,6 +72,8 @@ evince_SOURCES=                               \
        ev-window-title.h               \
        ev-sidebar.c                    \
        ev-sidebar.h                    \
+       ev-sidebar-annotations.c        \
+       ev-sidebar-annotations.h        \
        ev-sidebar-attachments.c        \
        ev-sidebar-attachments.h        \
        ev-sidebar-layers.c             \
@@ -91,6 +86,13 @@ evince_SOURCES=                              \
        ev-sidebar-thumbnails.h         \
        main.c
 
+if ENABLE_DBUS
+evince_SOURCES += \
+       ev-media-player-keys.c \
+       ev-media-player-keys.h
+endif
+
+
 evince_LDFLAGS = $(AM_LDFLAGS)
 
 if PLATFORM_WIN32
@@ -129,7 +131,7 @@ evinced_SOURCES=                    \
        ev-daemon.c
 
 evinced_CFLAGS=                                \
-       -DDATADIR=\"$(pkgdatadir)\"                             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"                       \
        -DGNOMEDATADIR=\"$(datadir)\"                           \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)                                       \
@@ -144,8 +146,7 @@ evinced_LDADD=                              \
 endif
 
 EXTRA_DIST = ev-marshal.list           \
-       evince-icon.rc                  \
-       $(EV_MEDIA_PLAYER_KEYS_SOURCES)
+       evince-icon.rc
 
 ev-marshal.h: $(srcdir)/ev-marshal.list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h