[print] Fixes segmentation violation when format is empty

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4230dbb80cdeae7b993fa670a4a2837035d67d73..0175b5a22805ca791b34ce0a354ce1369b98b0fd 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -8,12 +8,12 @@ INCLUDES=                                                     \
        -I$(top_srcdir)/cut-n-paste/totem-screensaver/          \
        -I$(top_srcdir)/cut-n-paste/gedit-message-area/         \
        -I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/     \
        -I$(top_srcdir)/cut-n-paste/totem-screensaver/          \
        -I$(top_srcdir)/cut-n-paste/gedit-message-area/         \
        -I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/     \

-       -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)/cut-n-paste/smclient/                   \
        -I$(top_srcdir)/libdocument                             \
        -I$(top_builddir)/libdocument                           \
        -I$(top_srcdir)/libview                                 \
        -I$(top_builddir)/libview                               \

+       -I$(top_srcdir)/libmisc                                 \

        -I$(top_srcdir)/properties                              \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"                  \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"                 \
        -I$(top_srcdir)/properties                              \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"                  \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"                 \


@@ -53,10 +53,6 @@ evince_SOURCES=                              \
        ev-navigation-action.h          \
        ev-navigation-action-widget.c   \
        ev-navigation-action-widget.h   \
        ev-navigation-action.h          \
        ev-navigation-action-widget.c   \
        ev-navigation-action-widget.h   \

-       ev-page-action.c                \
-       ev-page-action.h                \
-       ev-page-action-widget.c         \
-       ev-page-action-widget.h         \

        ev-password-view.h              \
        ev-password-view.c              \
        ev-print-operation.h            \
        ev-password-view.h              \
        ev-password-view.c              \
        ev-print-operation.h            \


@@ -87,21 +83,25 @@ evince_SOURCES=                             \
        ev-sidebar-page.h               \
        ev-sidebar-thumbnails.c         \
        ev-sidebar-thumbnails.h         \
        ev-sidebar-page.h               \
        ev-sidebar-thumbnails.c         \
        ev-sidebar-thumbnails.h         \

-       ev-stock-icons.c                \
-       ev-stock-icons.h                \

        main.c
 
        main.c
 

+evince_LDFLAGS = $(AM_LDFLAGS)
+
+if PLATFORM_WIN32
+evince_LDFLAGS += -mwindows
+endif
+

 evince_LDADD=                                                                          \
        $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la                         \
        $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la                  \
        $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la               \
        $(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la               \
        $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \
 evince_LDADD=                                                                          \
        $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la                         \
        $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la                  \
        $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la               \
        $(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la               \
        $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \

-       $(top_builddir)/cut-n-paste/evmountoperation/libevmountoperation.la             \

        $(top_builddir)/cut-n-paste/smclient/libsmclient.la                             \
        $(top_builddir)/properties/libevproperties.la                                   \
        $(top_builddir)/libdocument/libevdocument.la                                    \
        $(top_builddir)/libview/libevview.la                                            \
        $(top_builddir)/cut-n-paste/smclient/libsmclient.la                             \
        $(top_builddir)/properties/libevproperties.la                                   \
        $(top_builddir)/libdocument/libevdocument.la                                    \
        $(top_builddir)/libview/libevview.la                                            \

+       $(top_builddir)/libmisc/libevmisc.la                                            \

        $(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
        $(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c


@@ -116,19 +116,14 @@ EXTRA_DIST = ev-marshal.list              \
 
 
 ev-marshal.h: $(srcdir)/ev-marshal.list
 
 
 ev-marshal.h: $(srcdir)/ev-marshal.list

-       $(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h

 
 ev-marshal.c: $(srcdir)/ev-marshal.list
        echo '#include "ev-marshal.h"' > ev-marshal.c
 
 ev-marshal.c: $(srcdir)/ev-marshal.list
        echo '#include "ev-marshal.h"' > ev-marshal.c

-       $(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c

 
 DISTCLEANFILES= \
        ev-application-service.h
 
 
 DISTCLEANFILES= \
        ev-application-service.h
 

-if DBUS_TOOL_NO_PREFIX

 ev-application-service.h: $(srcdir)/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: $(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
+       $(AM_V_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml