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=16f30340428adc118b4c479ce1d7f3fcb67bc173;hb=761de5f5ba44cc94c98adf2b68809ea453d6bdfa;hp=8d86efe4451ec3fdd609ec82464ea9b037fdefac;hpb=66e5636dcaace0d9a98845490b09721c12ce3d2b;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8d86efe4..16f30340 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -17,6 +17,7 @@ INCLUDES=							\
 	-I$(top_srcdir)/properties				\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
+	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DEVINCE_COMPILATION					\
 	$(SHELL_CFLAGS)						\
@@ -61,14 +62,14 @@ evince_SOURCES=				\
 	ev-navigation-action-widget.h	\
 	ev-password-view.h		\
 	ev-password-view.c		\
-	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		\
 	ev-properties-fonts.h		\
+	ev-properties-license.c		\
+	ev-properties-license.h		\
 	ev-open-recent-action.c		\
 	ev-open-recent-action.h		\
 	ev-utils.c			\
@@ -110,6 +111,13 @@ evince_LDADD=										\
 	$(top_builddir)/libmisc/libevmisc.la						\
 	$(SHELL_LIBS)
 
+if PLATFORM_WIN32
+evince_LDADD += evince-icon.o
+
+evince-icon.o: $(srcdir)/evince-icon.rc $(top_srcdir)/data/evince.ico
+	$(WINDRES) $(srcdir)/evince-icon.rc -I $(top_srcdir)/data evince-icon.o
+endif
+
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
 if ENABLE_DBUS
@@ -146,6 +154,7 @@ endif
 EXTRA_DIST = ev-marshal.list		\
 	ev-application-service.xml	\
 	ev-daemon-service.xml		\
+	evince-icon.rc			\
 	$(EV_MEDIA_PLAYER_KEYS_SOURCES)
 
 
@@ -165,3 +174,5 @@ ev-application-service.h: $(srcdir)/ev-application-service.xml
 
 ev-daemon-service.h: $(srcdir)/ev-daemon-service.xml
 	$(AM_V_GEN)dbus-binding-tool --prefix=ev_daemon --mode=glib-server --output=ev-daemon-service.h $(srcdir)/ev-daemon-service.xml
+
+-include $(top_srcdir)/git.mk