Improve wording. String change! (#355128, David Lodge)

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 136527b9193ef2089ad3e8ab3f0719111576902d..a514461545572493c25dc9d5152b73d9e68872da 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,15 +4,15 @@ SUBDIRS=theme-bits
 
 if OS_UNIX
 SUBDIRS += xdgmime
-GTK_PRINT_PREVIEW_COMMAND="evince %f"
+GTK_PRINT_PREVIEW_COMMAND="evince --preview %f"
 endif
 
 DIST_SUBDIRS=theme-bits xdgmime
 
 if HAVE_CUPS
-GTK_PRINT_BACKENDS=pdf,cups
+GTK_PRINT_BACKENDS=file,cups
 else
-GTK_PRINT_BACKENDS=pdf,lpr
+GTK_PRINT_BACKENDS=file,lpr
 endif
 
 INCLUDES =                                             \
@@ -782,7 +782,7 @@ libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
 
 libgtk_x11_2_0_la_LIBADD = $(libadd)
 libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
-libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
 libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
 libgtk_directfb_2_0_la_LIBADD = $(libadd)
@@ -1086,7 +1086,8 @@ stamp-icons: $(STOCK_ICONS)
 
 gtkbuiltincache.h: @REBUILD@ stamp-icons
        $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
-       ./gtk-update-icon-cache --force --ignore-theme-index    \
+       GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders    \
+          ./gtk-update-icon-cache --force --ignore-theme-index                 \
           --source builtin_icons stock-icons > gtkbuiltincache.h
 
 EXTRA_DIST +=                   \
@@ -1102,8 +1103,12 @@ EXTRA_DIST +=                   \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
        gtkwin32embed.h         \
+       gtkwin32embedwidget.h   \
+       gtkwin32embedwidget.c   \
        gtkfilesystemwin32.h    \
        gtkfilesystemwin32.c    \
+       gtkprint-win32.h        \
+       gtkprint-win32.c        \
        gtkrc.default           \
        gtkrc.key.default       \
        gtkrc.key.emacs         \