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

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index dba3259272969f2a5f832a8e9161d220534c5c97..a514461545572493c25dc9d5152b73d9e68872da 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,14 +4,15 @@ SUBDIRS=theme-bits
 
 if OS_UNIX
 SUBDIRS += xdgmime
+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 =                                             \
@@ -25,6 +26,7 @@ INCLUDES =                                            \
        -DGTK_HOST=\"$(host)\"                          \
        -DGTK_COMPILATION                               \
        -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"  \
+       -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\"    \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
@@ -231,6 +233,7 @@ gtk_public_h_sources =          \
        gtkpreview.h            \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
+       gtkprintoperationpreview.h      \
        gtkprintsettings.h      \
        gtkprivate.h            \
        gtkprogress.h           \
@@ -487,6 +490,7 @@ gtk_c_sources =                 \
        gtkpreview.c            \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
+       gtkprintoperationpreview.c      \
        gtkprintsettings.c      \
        gtkprintutils.c         \
        gtkprogress.c           \
@@ -623,8 +627,8 @@ gtk_c_sources += \
        gtktrayicon-x11.c
 else
 if USE_WIN32
-gtk_private_h_sources += gtkwin32embed.h
-gtk_c_sources +=         gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c
+gtk_private_h_sources += gtkwin32embed.h gtkwin32embedwidget.h
+gtk_c_sources +=         gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
 else
 gtk_c_sources +=         gtkplug-stub.c gtksocket-stub.c
 endif
@@ -778,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
+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)
@@ -994,6 +998,7 @@ STOCK_ICONS = \
        stock-icons/24/gtk-open.png                     \
        stock-icons/24/gtk-orientation-reverse-landscape.png \
        stock-icons/24/gtk-orientation-landscape.png    \
+       stock-icons/24/gtk-orientation-reverse-portrait.png     \
        stock-icons/24/gtk-orientation-portrait.png     \
        stock-icons/24/gtk-paste.png                    \
        stock-icons/24/gtk-preferences.png              \
@@ -1081,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 +=                   \
@@ -1097,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         \