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 = \
-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 \
gtkpreview.h \
gtkprintcontext.h \
gtkprintoperation.h \
+ gtkprintoperationpreview.h \
gtkprintsettings.h \
gtkprivate.h \
gtkprogress.h \
gtk_unix_print_public_h_sources = \
gtkpagesetupunixdialog.h \
+ gtkprintunixdialog.h \
gtkprinter.h \
- gtkprintunixdialog.h
+ gtkprintjob.h
+
# Installed header files without compatibility guarantees
# that are not include in gtk/gtk.h
gtkfilechooserembed.h \
gtkfilechooserentry.h \
gtkfilechooserprivate.h \
+ gtkfilechoosersettings.h \
gtkfilechooserutils.h \
gtkfilesystemmodel.h \
gtkfilesystemunix.h \
gtkpathbar.h \
gtkplugprivate.h \
gtkprintoperation-private.h\
+ gtkprintutils.h \
gtkrbtree.h \
gtkrecentchooserdefault.h \
gtkrecentchooserprivate.h \
gtkfilechooserdialog.c \
gtkfilechooserembed.c \
gtkfilechooserentry.c \
+ gtkfilechoosersettings.c \
gtkfilechooserutils.c \
gtkfilechooserwidget.c \
gtkfilefilter.c \
gtkpreview.c \
gtkprintcontext.c \
gtkprintoperation.c \
+ gtkprintoperationpreview.c \
gtkprintsettings.c \
+ gtkprintutils.c \
gtkprogress.c \
gtkprogressbar.c \
gtkradioaction.c \
gtkprinter-private.h \
gtkprinteroption.h \
gtkprinteroptionset.h \
- gtkprinteroptionwidget.h \
- gtkprintjob.h
+ gtkprinteroptionwidget.h
gtk_c_sources += \
gtkfilesystemunix.c \
endif
if OS_WIN32
-gtk_private_h_sources +=
- gtkfilesystemwin32.h \
- gtkprint-win32.h
+gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
gtk_c_sources += \
gtkfilesystemwin32.c \
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
stamp_files = \
stamp-gtkmarshalers.h \
stamp-gtkmarshal.h \
- stamp-gtktypebuiltins.h
+ stamp-gtktypebuiltins.h \
+ stamp-icons
# non-header sources (headers should be specified in the above variables)
# that don't serve as direct make target sources, i.e. they don't have
# their own .lo rules and don't get publically installed
gtk_extra_sources = \
paper_names.c \
- paper_names_offsts.c \
+ paper_names_offsets.c \
gen-paper-names.c \
gtk.symbols \
gtkversion.h.in \
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)
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 \
stock-icons/24/gtk-media-rewind-rtl.png \
stock-icons/24/gtk-save.png
+# need to copy the icons so that we can replace the generated ones with
+# symlinks, even in the readonly srcdir case
stamp-icons: $(STOCK_ICONS)
+ if [ ! -d stock-icons ]; then \
+ cp -R $(srcdir)/stock-icons .; \
+ chmod -R u+w stock-icons; \
+ fi && \
for i in 16 24; do \
- (cd $(srcdir)/stock-icons/$$i \
- && rm -f gtk-go-back-rtl.png \
- && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png \
- && rm -f gtk-go-forward-rtl.png \
- && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png \
- && rm -f gtk-goto-first-rtl.png \
- && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png \
- && rm -f gtk-goto-last-rtl.png \
- && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png \
- && rm -f gtk-media-forward-rtl.png \
- && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png \
- && rm -f gtk-media-next-rtl.png \
- && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png \
- && rm -f gtk-media-previous-rtl.png \
- && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png \
- && rm -f gtk-media-rewind-rtl.png \
- && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png \
- && rm -f gtk-save.png \
- && $(LN_S) gtk-floppy.png gtk-save.png) \
+ (cd stock-icons/$$i \
+ && $(LN_S) -f gtk-go-forward-ltr.png gtk-go-back-rtl.png \
+ && $(LN_S) -f gtk-go-back-ltr.png gtk-go-forward-rtl.png \
+ && $(LN_S) -f gtk-goto-last-ltr.png gtk-goto-first-rtl.png \
+ && $(LN_S) -f gtk-goto-first-ltr.png gtk-goto-last-rtl.png \
+ && $(LN_S) -f gtk-media-rewind-ltr.png gtk-media-forward-rtl.png \
+ && $(LN_S) -f gtk-media-previous-ltr.png gtk-media-next-rtl.png \
+ && $(LN_S) -f gtk-media-next-ltr.png gtk-media-previous-rtl.png \
+ && $(LN_S) -f gtk-media-forward-ltr.png gtk-media-rewind-rtl.png \
+ && $(LN_S) -f gtk-floppy.png gtk-save.png) \
done \
&& touch stamp-icons
-gtkbuiltincache.h: @REBUILD@ gtk-update-icon-cache$(EXEEXT) stamp-icons
- ./gtk-update-icon-cache --force --ignore-theme-index \
- --source builtin_icons $(srcdir)/stock-icons > gtkbuiltincache.h
-
-MAINTAINERCLEANFILES += stamp-icons
+gtkbuiltincache.h: @REBUILD@ stamp-icons
+ $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
+ 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 += \
$(STOCK_ICONS) \
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 \
projects / ~andy / gtk / blobdiff