X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2FMakefile.am;h=2339a86543ae8140b43aed9cbbec2aa8932a4cbb;hb=a486e1c54a82beaf05a5d6bce51781857cdb679d;hp=6a128c814191332773dc306cd782e7d5feecb107;hpb=0c230f60610f22b537d206e3fe64fdebbb609bf7;p=~andy%2Fgtk

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6a128c814..2339a8654 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,12 +1,20 @@
 # Makefile.am for gtk+/gtk
+include $(top_srcdir)/Makefile.decl
 
-SUBDIRS=theme-bits
-
-if OS_UNIX
-SUBDIRS += xdgmime
+if USE_QUARTZ
+GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
+else
+GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-DIST_SUBDIRS=stock-icons theme-bits xdgmime
+SUBDIRS = theme-bits . tests
+DIST_SUBDIRS=theme-bits tests
+
+if HAVE_CUPS
+GTK_PRINT_BACKENDS=file,cups
+else
+GTK_PRINT_BACKENDS=file,lpr
+endif
 
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Gtk\"				\
@@ -18,16 +26,21 @@ INCLUDES =						\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
 	-DGTK_HOST=\"$(host)\"				\
 	-DGTK_COMPILATION				\
+	-DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"	\
+	-DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\"	\
+	-I$(top_builddir)				\
 	-I$(top_builddir)/gtk				\
 	-I$(top_srcdir) -I../gdk			\
 	-I$(top_srcdir)/gdk				\
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\
-	$(GTK_DEP_CFLAGS)
+	$(GTK_DEP_CFLAGS)				\
+	$(gtk_clipboard_dnd_c_sources_CFLAGS)		\
+	$(INCLUDED_IMMODULE_DEFINE)
 
 gtarget=$(gdktarget)
 
@@ -37,16 +50,16 @@ endif
 
 if OS_WIN32
 gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(gtk_def)
+gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
 
 gtk_win32_res = gtk-win32-res.o
-gtk_win32_res_ldflag = -Wl,$(gtk_win32_res)
+gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
 
 gtk-win32-res.o : gtk-win32.rc
 	$(WINDRES) gtk-win32.rc $@
 
 install-def-file: gtk.def
-	$(INSTALL) $(gtk_def) $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+	$(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 uninstall-def-file:
 	-rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 else
@@ -58,7 +71,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
 
 gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
-	lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
 
 install-ms-lib:
 	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -70,38 +83,56 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
+# This places the generated .def file in srcdir, since it is expected to be there.
+# (The one from a tarball is)
 gtk.def: gtk.symbols
-	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > gtk.def
+	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
 gtkalias.h: gtk.symbols
 	  $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
 gtkaliasdef.c: gtk.symbols
 	  $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
 
+check-aliases:
+	@$(TESTS_ENVIRONMENT) $(srcdir)/aliasfilescheck.sh
+
+.PHONY: check-aliases
+
+TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
+TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS += abicheck.sh pltcheck.sh
 endif
 
-# libtool stuff: set version and export symbols for resolving
-# since automake doesn't support conditionalized libsomething_la_LDFLAGS
-# we use the general approach here
 libgtkincludedir = $(includedir)/gtk-2.0/gtk
 libadd =								\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)				\
 	$(GTK_DEP_LIBS)
+deps =
 
-if OS_UNIX
-libadd += xdgmime/libxdgmime.la
-endif
-
-# common options for the various packages.
+# libtool stuff: set version and export symbols for resolving
+# since automake doesn't support conditionalized libsomething_la_LDFLAGS
+# we use the general approach here
 libtool_opts =							\
   -version-info $(LT_VERSION_INFO)				\
   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)	\
   -rpath $(libdir) $(libgtk_target_ldflags)
 
 
+included-modules:
+if HAVE_INCLUDED_IMMMODULES
+	@cd $(top_builddir)/modules/input && $(MAKE) $(AM_MAKEFLAGS) included-modules
+
+libadd += $(INCLUDED_IMMODULE_OBJ)
+deps += $(INCLUDED_IMMODULE_OBJ)
+
+$(INCLUDED_IMMODULE_OBJ): included-modules
+	@true
+endif
+
+.PHONY: included-modules
+
 #
 # setup source file variables
 #
@@ -117,6 +148,7 @@ gtk_public_h_sources =          \
 	gtkaccessible.h		\
 	gtkaction.h		\
 	gtkactiongroup.h	\
+	gtkactivatable.h	\
 	gtkadjustment.h		\
 	gtkalignment.h		\
 	gtkarrow.h		\
@@ -126,6 +158,8 @@ gtk_public_h_sources =          \
 	gtkbin.h		\
 	gtkbindings.h		\
 	gtkbox.h		\
+	gtkbuilder.h		\
+	gtkbuildable.h		\
 	gtkbutton.h		\
 	gtkcalendar.h		\
 	gtkcelleditable.h	\
@@ -135,21 +169,19 @@ gtk_public_h_sources =          \
 	gtkcellrenderercombo.h	\
 	gtkcellrendererpixbuf.h	\
 	gtkcellrendererprogress.h \
+	gtkcellrendererspin.h   \
 	gtkcellrenderertext.h	\
 	gtkcellrenderertoggle.h	\
 	gtkcellview.h		\
 	gtkcheckbutton.h	\
 	gtkcheckmenuitem.h	\
 	gtkclipboard.h		\
-	gtkclist.h		\
 	gtkcolorbutton.h	\
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
-	gtkcombo.h		\
 	gtkcombobox.h		\
 	gtkcomboboxentry.h	\
 	gtkcontainer.h		\
-	gtkctree.h		\
 	gtkcurve.h		\
 	gtkdebug.h              \
 	gtkdialog.h		\
@@ -166,7 +198,6 @@ gtk_public_h_sources =          \
 	gtkfilechooserdialog.h  \
 	gtkfilechooserwidget.h  \
 	gtkfilefilter.h		\
-	gtkfilesel.h		\
 	gtkfixed.h		\
 	gtkfontbutton.h		\
 	gtkfontsel.h		\
@@ -181,6 +212,7 @@ gtk_public_h_sources =          \
 	gtkhscale.h		\
 	gtkhscrollbar.h		\
 	gtkhseparator.h		\
+	gtkhsv.h		\
 	gtkiconfactory.h	\
 	gtkicontheme.h		\
 	gtkiconview.h		\
@@ -193,12 +225,9 @@ gtk_public_h_sources =          \
 	gtkinputdialog.h	\
 	gtkinvisible.h		\
 	gtkitem.h		\
-	gtkitemfactory.h	\
 	gtklabel.h		\
 	gtklayout.h             \
 	gtklinkbutton.h		\
-	gtklist.h		\
-	gtklistitem.h		\
 	gtkliststore.h		\
 	gtkmain.h		\
 	gtkmenu.h		\
@@ -209,16 +238,19 @@ gtk_public_h_sources =          \
 	gtkmessagedialog.h	\
 	gtkmisc.h		\
 	gtkmodules.h		\
+	gtkmountoperation.h     \
 	gtknotebook.h		\
 	gtkobject.h		\
-	gtkoldeditable.h	\
-	gtkoptionmenu.h		\
+	gtkorientable.h		\
+	gtkpagesetup.h		\
 	gtkpaned.h		\
-	gtkpixmap.h		\
+	gtkpapersize.h		\
 	gtkplug.h		\
-	gtkpreview.h		\
+	gtkprintcontext.h	\
+	gtkprintoperation.h	\
+	gtkprintoperationpreview.h	\
+	gtkprintsettings.h	\
 	gtkprivate.h		\
-	gtkprogress.h		\
 	gtkprogressbar.h	\
 	gtkradioaction.h	\
 	gtkradiobutton.h	\
@@ -226,16 +258,24 @@ gtk_public_h_sources =          \
 	gtkradiotoolbutton.h	\
 	gtkrange.h		\
 	gtkrc.h			\
+	gtkrecentaction.h	\
+	gtkrecentchooser.h 	\
+	gtkrecentchooserdialog.h \
+	gtkrecentchoosermenu.h 	\
+	gtkrecentchooserwidget.h \
+	gtkrecentfilter.h 	\
+	gtkrecentmanager.h 	\
 	gtkruler.h		\
 	gtkscale.h		\
+	gtkscalebutton.h	\
 	gtkscrollbar.h		\
 	gtkscrolledwindow.h	\
 	gtkselection.h		\
 	gtkseparator.h		\
 	gtkseparatormenuitem.h	\
 	gtkseparatortoolitem.h	\
+	gtkshow.h		\
 	gtksettings.h		\
-	gtksignal.h		\
 	gtksizegroup.h		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
@@ -245,7 +285,7 @@ gtk_public_h_sources =          \
 	gtkstyle.h		\
 	gtktable.h		\
 	gtktearoffmenuitem.h    \
-	gtktext.h		\
+	gtktestutils.h		\
 	gtktextbuffer.h		\
 	gtktextbufferrichtext.h	\
 	gtktextchild.h		\
@@ -255,17 +295,15 @@ gtk_public_h_sources =          \
 	gtktexttag.h		\
 	gtktexttagtable.h	\
 	gtktextview.h		\
-	gtktipsquery.h		\
 	gtktoggleaction.h	\
 	gtktogglebutton.h	\
 	gtktoggletoolbutton.h	\
 	gtktoolbar.h		\
 	gtktoolbutton.h		\
 	gtktoolitem.h		\
-	gtktooltips.h		\
-	gtktree.h		\
+	gtktoolshell.h		\
+	gtktooltip.h		\
 	gtktreednd.h		\
-	gtktreeitem.h		\
 	gtktreemodel.h		\
 	gtktreemodelfilter.h	\
 	gtktreemodelsort.h	\
@@ -279,6 +317,7 @@ gtk_public_h_sources =          \
 	gtkvbbox.h		\
 	gtkvbox.h		\
 	gtkviewport.h		\
+	gtkvolumebutton.h	\
 	gtkvpaned.h		\
 	gtkvruler.h		\
 	gtkvscale.h		\
@@ -287,45 +326,70 @@ gtk_public_h_sources =          \
 	gtkwidget.h		\
 	gtkwindow.h
 
+if OS_UNIX
+gtk_unix_print_public_h_sources =    \
+	gtkpagesetupunixdialog.h	\
+	gtkprintunixdialog.h		\
+	gtkprinter.h			\
+	gtkprintjob.h			\
+	gtkunixprint.h
+endif
+
 # Installed header files without compatibility guarantees
-# that are not include in gtk/gtk.h
+# that are not included in gtk/gtk.h
 gtk_semi_private_h_sources =    \
-	gtktextlayout.h		\
-	gtkfilesystem.h
+	gtktextlayout.h
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =		\
+	gtkquery.h		\
+	gtksearchengine.h	\
+	gtksearchenginesimple.h	\
 	gtkdndcursors.h		\
 	gtkentryprivate.h	\
+	gtkbuilderprivate.h 	\
+	gtkfilechooserdefault.h	\
 	gtkfilechooserembed.h	\
 	gtkfilechooserentry.h	\
-	gtkfilechooserdefault.h	\
 	gtkfilechooserprivate.h	\
+	gtkfilechoosersettings.h \
 	gtkfilechooserutils.h	\
-	gtkfilesystemunix.h	\
+	gtkfilesystem.h		\
 	gtkfilesystemmodel.h	\
 	gtkiconcache.h		\
+	gtkintl.h		\
+	gtkkeyhash.h		\
+	gtkmnemonichash.h	\
 	gtkpathbar.h		\
 	gtkplugprivate.h	\
+	gtkprintoperation-private.h\
+	gtkprintutils.h		\
 	gtkrbtree.h		\
-	gtksequence.h		\
+	gtkrecentchooserdefault.h \
+	gtkrecentchooserprivate.h \
+	gtkrecentchooserutils.h \
 	gtksocketprivate.h	\
 	gtktextbtree.h		\
+	gtktextbufferserialize.h\
 	gtktextchildprivate.h	\
-	gtktextsegment.h	\
-	gtktexttypes.h		\
-	gtktextutil.h		\
 	gtktextiterprivate.h	\
 	gtktextmarkprivate.h	\
+	gtktextsegment.h	\
 	gtktexttagprivate.h	\
+	gtktexttypes.h		\
+	gtktextutil.h		\
 	gtkthemes.h		\
+	gtktoggleactionprivate.h\
 	gtktreedatalist.h	\
 	gtktreeprivate.h	\
 	gtkwindow-decorate.h	\
-	gtktoggleactionprivate.h
+	$(gtk_clipboard_dnd_h_sources)
 
 # GTK+ C sources to build the library from
-gtk_c_sources =                 \
+gtk_base_c_sources =            \
+	gtkquery.c		\
+	gtksearchengine.c	\
+	gtksearchenginesimple.c	\
 	fnmatch.c		\
 	gtkaboutdialog.c	\
 	gtkaccelgroup.c		\
@@ -334,6 +398,7 @@ gtk_c_sources =                 \
 	gtkaccessible.c		\
 	gtkaction.c		\
 	gtkactiongroup.c	\
+	gtkactivatable.c	\
 	gtkadjustment.c		\
 	gtkalignment.c		\
 	gtkarrow.c		\
@@ -343,6 +408,9 @@ gtk_c_sources =                 \
 	gtkbin.c		\
 	gtkbindings.c		\
 	gtkbox.c		\
+	gtkbuildable.c		\
+	gtkbuilder.c		\
+	gtkbuilderparser.c	\
 	gtkbutton.c		\
 	gtkcalendar.c		\
 	gtkcelleditable.c	\
@@ -352,20 +420,18 @@ gtk_c_sources =                 \
 	gtkcellrenderercombo.c	\
 	gtkcellrendererpixbuf.c	\
 	gtkcellrendererprogress.c \
+	gtkcellrendererspin.c   \
 	gtkcellrenderertext.c	\
 	gtkcellrenderertoggle.c	\
 	gtkcellview.c		\
 	gtkcheckbutton.c	\
 	gtkcheckmenuitem.c	\
-	gtkclist.c		\
 	gtkcolorbutton.c	\
 	gtkcolorsel.c		\
 	gtkcolorseldialog.c	\
-	gtkcombo.c		\
 	gtkcombobox.c		\
 	gtkcomboboxentry.c	\
 	gtkcontainer.c		\
-	gtkctree.c		\
 	gtkcurve.c		\
 	gtkdialog.c		\
 	gtkdrawingarea.c	\
@@ -376,14 +442,14 @@ gtk_c_sources =                 \
 	gtkexpander.c		\
 	gtkfilechooser.c	\
 	gtkfilechooserbutton.c	\
+	gtkfilechooserdefault.c	\
 	gtkfilechooserdialog.c	\
 	gtkfilechooserembed.c	\
 	gtkfilechooserentry.c	\
-	gtkfilechooserdefault.c	\
+	gtkfilechoosersettings.c \
 	gtkfilechooserutils.c	\
 	gtkfilechooserwidget.c	\
 	gtkfilefilter.c		\
-	gtkfilesel.c		\
 	gtkfilesystem.c		\
 	gtkfilesystemmodel.c	\
 	gtkfixed.c		\
@@ -401,9 +467,9 @@ gtk_c_sources =                 \
 	gtkhscrollbar.c		\
 	gtkhseparator.c		\
 	gtkhsv.c		\
-	gtkhsv.h		\
-	gtkiconfactory.c	\
 	gtkiconcache.c		\
+	gtkiconcachevalidator.c	\
+	gtkiconfactory.c	\
 	gtkicontheme.c		\
 	gtkiconview.c		\
 	gtkimage.c		\
@@ -413,17 +479,12 @@ gtk_c_sources =                 \
 	gtkimmodule.c		\
 	gtkimmulticontext.c	\
 	gtkinputdialog.c	\
-	gtkintl.h		\
 	gtkinvisible.c		\
 	gtkitem.c		\
-	gtkitemfactory.c	\
 	gtkkeyhash.c		\
-	gtkkeyhash.h		\
 	gtklabel.c		\
 	gtklayout.c		\
 	gtklinkbutton.c		\
-	gtklist.c		\
-	gtklistitem.c		\
 	gtkliststore.c		\
 	gtkmain.c		\
 	gtkmarshal.c		\
@@ -436,18 +497,21 @@ gtk_c_sources =                 \
 	gtkmessagedialog.c	\
 	gtkmisc.c		\
 	gtkmnemonichash.c	\
-	gtkmnemonichash.h	\
 	gtkmodules.c		\
+	gtkmountoperation.c     \
 	gtknotebook.c		\
 	gtkobject.c		\
-	gtkoldeditable.c	\
-	gtkoptionmenu.c		\
+	gtkorientable.c		\
+	gtkpagesetup.c		\
 	gtkpaned.c		\
+	gtkpapersize.c		\
 	gtkpathbar.c		\
-	gtkpixmap.c		\
 	gtkplug.c		\
-	gtkpreview.c		\
-	gtkprogress.c		\
+	gtkprintcontext.c	\
+	gtkprintoperation.c	\
+	gtkprintoperationpreview.c	\
+	gtkprintsettings.c	\
+	gtkprintutils.c		\
 	gtkprogressbar.c	\
 	gtkradioaction.c	\
 	gtkradiobutton.c	\
@@ -456,18 +520,27 @@ gtk_c_sources =                 \
 	gtkrange.c		\
 	gtkrbtree.c 		\
 	gtkrc.c			\
+	gtkrecentaction.c	\
+	gtkrecentchooserdefault.c \
+	gtkrecentchooserdialog.c \
+	gtkrecentchoosermenu.c 	\
+	gtkrecentchooserwidget.c \
+	gtkrecentchooserutils.c \
+	gtkrecentchooser.c 	\
+	gtkrecentfilter.c 	\
+	gtkrecentmanager.c 	\
 	gtkruler.c		\
 	gtkscale.c		\
+	gtkscalebutton.c	\
 	gtkscrollbar.c		\
 	gtkscrolledwindow.c	\
-	gtksequence.c		\
 	gtkselection.c		\
 	gtkseparator.c		\
 	gtkseparatormenuitem.c	\
 	gtkseparatortoolitem.c	\
 	gtksettings.c		\
-	gtksignal.c		\
 	gtksizegroup.c		\
+	gtkshow.c		\
 	gtksocket.c		\
 	gtkspinbutton.c		\
 	gtkstatusbar.c		\
@@ -476,19 +549,16 @@ gtk_c_sources =                 \
 	gtkstyle.c		\
 	gtktable.c		\
 	gtktearoffmenuitem.c    \
-	gtktext.c		\
+	gtktestutils.c		\
 	gtktextbtree.c		\
 	gtktextbuffer.c		\
 	gtktextbufferrichtext.c	\
 	gtktextbufferserialize.c\
-	gtktextbufferserialize.h\
 	gtktextchild.c		\
 	gtktextdisplay.c	\
 	gtktextiter.c		\
-	gtktextiterprivate.h	\
 	gtktextlayout.c		\
 	gtktextmark.c		\
-	gtktextmarkprivate.h	\
 	gtktextsegment.c	\
 	gtktexttag.c		\
 	gtktexttagtable.c	\
@@ -496,18 +566,16 @@ gtk_c_sources =                 \
 	gtktextutil.c		\
 	gtktextview.c		\
 	gtkthemes.c		\
-	gtktipsquery.c		\
 	gtktoggleaction.c	\
 	gtktogglebutton.c	\
 	gtktoggletoolbutton.c	\
 	gtktoolbar.c		\
 	gtktoolbutton.c		\
 	gtktoolitem.c		\
-	gtktooltips.c		\
-	gtktree.c		\
+	gtktoolshell.c		\
+	gtktooltip.c		\
 	gtktreedatalist.c	\
 	gtktreednd.c		\
-	gtktreeitem.c		\
 	gtktreemodel.c		\
 	gtktreemodelfilter.c	\
 	gtktreemodelsort.c	\
@@ -521,6 +589,7 @@ gtk_c_sources =                 \
 	gtkuimanager.c		\
 	gtkvbbox.c		\
 	gtkvbox.c		\
+	gtkvolumebutton.c	\
 	gtkviewport.c		\
 	gtkvpaned.c		\
 	gtkvruler.c		\
@@ -530,41 +599,135 @@ gtk_c_sources =                 \
 	gtkwidget.c		\
 	gtkwindow-decorate.c    \
 	gtkwindow.c		\
-	xembed.h		\
 	$(gtk_clipboard_dnd_c_sources)
 
+# Broken
+gtk_public_h_sources += \
+	gtktext.h		\
+	gtktree.h		\
+	gtktreeitem.h
+gtk_base_c_sources += \
+	gtktext.c		\
+	gtktree.c		\
+	gtktreeitem.c
+
+# Deprecated
+gtk_public_h_sources += \
+	gtkclist.h		\
+	gtkcombo.h		\
+	gtkctree.h		\
+	gtkfilesel.h		\
+	gtkitemfactory.h	\
+	gtklist.h		\
+	gtklistitem.h		\
+	gtkoldeditable.h	\
+	gtkoptionmenu.h		\
+	gtkpixmap.h		\
+	gtkpreview.h		\
+	gtkprogress.h		\
+	gtksignal.h		\
+	gtktipsquery.h		\
+	gtktooltips.h
+gtk_base_c_sources += \
+	gtkclist.c		\
+	gtkcombo.c		\
+	gtkctree.c		\
+	gtkfilesel.c		\
+	gtkitemfactory.c	\
+	gtklist.c		\
+	gtklistitem.c		\
+	gtkoldeditable.c	\
+	gtkoptionmenu.c		\
+	gtkpixmap.c		\
+	gtkpreview.c		\
+	gtkprogress.c		\
+	gtksignal.c		\
+	gtktipsquery.c		\
+	gtktooltips.c
+
+gtk_c_sources = $(gtk_base_c_sources)
+gtk_all_c_sources = $(gtk_base_c_sources)
+
+gtk_os_unix_c_sources = \
+	gtkpagesetupunixdialog.c	\
+	gtkprinter.c			\
+	gtkprinteroption.c		\
+	gtkprinteroptionset.c		\
+	gtkprinteroptionwidget.c	\
+	gtkprintjob.c			\
+	gtkprintoperation-unix.c	\
+	gtkprintunixdialog.c		\
+        gtkprintbackend.c		\
+	gtksearchenginebeagle.c		\
+	gtksearchenginetracker.c
+gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
-gtk_private_h_sources += gtkfilesystemunix.h
-gtk_c_sources +=         gtkfilesystemunix.c
+gtk_private_h_sources += \
+	gtkiconcachevalidator.h		\
+	gtkprintbackend.h		\
+	gtkprinter-private.h		\
+	gtkprinteroption.h		\
+	gtkprinteroptionset.h		\
+	gtkprinteroptionwidget.h	\
+	gtksearchenginebeagle.h		\
+	gtksearchenginetracker.h
+gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 
+gtk_os_win32_c_sources = \
+	gtkprint-win32.c		\
+	gtkprintoperation-win32.c
+gtk_all_c_sources += $(gtk_os_win32_c_sources)
 if OS_WIN32
-gtk_private_h_sources += gtkfilesystemwin32.h
-gtk_c_sources +=         gtkfilesystemwin32.c
+gtk_private_h_sources += gtkprint-win32.h
+gtk_c_sources += $(gtk_os_win32_c_sources)
 endif
 
-if USE_X11
-gtk_private_h_sources += gtkxembed.h gtktrayicon.h
-gtk_c_sources += \
+gtk_use_x11_c_sources = \
 	gtkplug-x11.c   \
 	gtksocket-x11.c \
 	gtkxembed.c     \
 	gtktrayicon-x11.c
+gtk_use_win32_c_sources = \
+	gtkplug-win32.c   \
+	gtksocket-win32.c \
+	gtkwin32embed.c   \
+	gtkwin32embedwidget.c
+gtk_use_quartz_c_sources =	\
+	gtksearchenginequartz.c	\
+	gtkplug-stub.c		\
+	gtksocket-stub.c
+gtk_use_stub_c_sources = \
+	gtkplug-stub.c   \
+	gtksocket-stub.c
+gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
+if USE_X11
+gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
+gtk_c_sources += $(gtk_use_x11_c_sources)
 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 += $(gtk_use_win32_c_sources)
+else
+if USE_QUARTZ
+gtk_private_h_sources += gtksearchenginequartz.h
+gtk_c_sources += $(gtk_use_quartz_c_sources)
+gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c"
 else
-gtk_c_sources +=         gtkplug-stub.c gtksocket-stub.c
+gtk_c_sources += $(gtk_use_stub_c_sources)
+endif
 endif
 endif
 
 if USE_QUARTZ
-gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h
+gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c
+gtk_clipboard_dnd_h_sources = gtkquartz.h
 gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
 else
 gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+gtk_clipboard_dnd_c_sources_CFLAGS =
 endif
+EXTRA_DIST += gtkquartz.h
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -577,17 +740,18 @@ gtk_built_public_sources =			\
 	gtkmarshal.h				\
 	gtktypebuiltins.h
 
-# built sources that don't get installed
+# built headers that don't get installed
 gtk_built_private_headers =			\
 	gtkalias.h				\
 	gtkmarshalers.h				\
-	gtkbuiltincache.h
+	gtkbuiltincache.h			\
+	gtkimcontextsimpleseqs.h
 
 gtk_built_sources =				\
 	gtkaliasdef.c				\
 	gtktypebuiltins.c			\
+	gtktypefuncs.c				\
 	gtkmarshalers.c				\
-	gtkmarshalers.h				\
 	gtkmarshal.c				\
 	${gtk_built_private_headers}		\
 	${gtk_built_public_sources}
@@ -595,12 +759,17 @@ gtk_built_sources =				\
 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_offsets.c			\
+	gen-paper-names.c			\
+	gtkstatusicon-quartz.c                  \
 	gtk.symbols				\
 	gtkversion.h.in				\
 	gtkmarshalers.list			\
@@ -609,16 +778,17 @@ gtk_extra_sources =				\
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
 EXTRA_HEADERS =
-EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
+EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
+EXTRA_DIST += $(STOCK_ICONS)
 
 #
 # rules to generate built sources
 #
 # setup autogeneration dependencies
-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
+gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
 CLEANFILES = $(gen_sources)
 
 BUILT_SOURCES = $(gtk_built_sources)
@@ -636,7 +806,9 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
 	&& rm -f xgen-gmlh \
 	&& echo timestamp > $(@F)	
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
-	(echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
+	(echo "#include \"gtkmarshalers.h\""; \
+	 echo "#include \"gtkalias.h\""; \
+	 $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
 	&& cp xgen-gmlc gtkmarshalers.c \
 	&& rm -f xgen-gmlc
 
@@ -650,63 +822,70 @@ stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
 	&& rm -f xgen-gmh \
 	&& echo timestamp > $(@F)
 gtkmarshal.c: @REBUILD@ gtkmarshal.list
-	(echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body) >> xgen-gmc \
+	(echo "#include \"gtkmarshal.h\""; \
+	 echo "#include \"gtkalias.h\""; \
+	 $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body; \
+	 echo "#define __gtk_marshal_MARSHAL_C__"; \
+	 echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
 	&& cp xgen-gmc gtkmarshal.c \
-	&& rm -f xgen-gmc 
+	&& rm -f xgen-gmc
 
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
 	@true
-stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \
+stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
 		$(gtk_public_h_sources) ) >> xgen-gtbh \
 	&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
 	&& rm -f xgen-gtbh \
 	&& echo timestamp > $(@F)
-gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \
-			--ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
+gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
 		$(gtk_public_h_sources) ) > xgen-gtbc \
 	&& cp xgen-gtbc gtktypebuiltins.c  \
 	&& rm -f xgen-gtbc
 
+gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
+	echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
+	  ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+	  grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
+	  sort | uniq | \
+	  sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+	&& cp xgen-gtf $@ && rm -f xgen-gtf
+gtktestutils.c: gtktypefuncs.c
+
 # target platform:
 lib_LTLIBRARIES = $(gtktargetlib)
 
 gtkincludedir = $(includedir)/gtk-2.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
 
+gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk
+gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
+
 libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
 
 libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
 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
-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
+libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
 libgtk_directfb_2_0_la_LIBADD = $(libadd)
 
+libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
+libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
+
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
 
 install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS
@@ -746,7 +925,10 @@ LDADDS =								\
 #
 # Installed tools
 #
-bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+bin_PROGRAMS = \
+	gtk-query-immodules-2.0 \
+	gtk-update-icon-cache
+bin_SCRIPTS = gtk-builder-convert
 
 gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_2_0_LDADD = $(LDADDS)
@@ -755,7 +937,8 @@ gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
 gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 
-gtk_update_icon_cache_SOURCES = updateiconcache.c
+gtk_update_icon_cache_SOURCES = \
+	updateiconcache.c 
 
 .PHONY: files test test-debug
 
@@ -765,9 +948,11 @@ files:
 	done
 
 STOCK_ICONS = \
+	stock-icons/16/document-open-recent.png		\
 	stock-icons/16/gtk-about.png  			\
 	stock-icons/16/gtk-add.png    			\
 	stock-icons/16/gtk-cdrom.png  			\
+	stock-icons/16/gtk-close.png  			\
 	stock-icons/16/gtk-connect.png        		\
 	stock-icons/16/gtk-convert.png        		\
 	stock-icons/16/gtk-copy.png   			\
@@ -817,10 +1002,15 @@ STOCK_ICONS = \
 	stock-icons/16/gtk-network.png        		\
 	stock-icons/16/gtk-new.png    			\
 	stock-icons/16/gtk-open.png   			\
+	stock-icons/16/gtk-page-setup.png 		\
 	stock-icons/16/gtk-paste.png  			\
 	stock-icons/16/gtk-preferences.png    		\
 	stock-icons/16/gtk-print.png  			\
+	stock-icons/16/gtk-print-error.png  		\
+	stock-icons/16/gtk-print-paused.png  		\
 	stock-icons/16/gtk-print-preview.png  		\
+	stock-icons/16/gtk-print-report.png  		\
+	stock-icons/16/gtk-print-warning.png  		\
 	stock-icons/16/gtk-properties.png     		\
 	stock-icons/16/gtk-quit.png   			\
 	stock-icons/16/gtk-redo-ltr.png       		\
@@ -831,6 +1021,7 @@ STOCK_ICONS = \
 	stock-icons/16/gtk-revert-to-saved-rtl.png    	\
 	stock-icons/16/gtk-save-as.png        		\
 	stock-icons/16/gtk-select-all.png     		\
+	stock-icons/16/gtk-select-color.png     	\
 	stock-icons/16/gtk-select-font.png    		\
 	stock-icons/16/gtk-sort-ascending.png	 	\
 	stock-icons/16/gtk-sort-descending.png        	\
@@ -857,6 +1048,11 @@ STOCK_ICONS = \
 	stock-icons/20/gtk-no.png     			\
 	stock-icons/20/gtk-ok.png     			\
 	stock-icons/20/gtk-yes.png    			\
+	stock-icons/24/audio-volume-high.png		\
+	stock-icons/24/audio-volume-low.png		\
+	stock-icons/24/audio-volume-medium.png		\
+	stock-icons/24/audio-volume-muted.png		\
+	stock-icons/24/document-open-recent.png		\
 	stock-icons/24/gtk-about.png  			\
 	stock-icons/24/gtk-add.png    			\
 	stock-icons/24/gtk-bold.png   			\
@@ -912,10 +1108,19 @@ STOCK_ICONS = \
 	stock-icons/24/gtk-network.png        		\
 	stock-icons/24/gtk-new.png    			\
 	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-page-setup.png 		\
 	stock-icons/24/gtk-paste.png  			\
 	stock-icons/24/gtk-preferences.png    		\
 	stock-icons/24/gtk-print.png  			\
+	stock-icons/24/gtk-print-error.png  		\
+	stock-icons/24/gtk-print-paused.png  		\
 	stock-icons/24/gtk-print-preview.png  		\
+	stock-icons/24/gtk-print-report.png  		\
+	stock-icons/24/gtk-print-warning.png  		\
 	stock-icons/24/gtk-properties.png     		\
 	stock-icons/24/gtk-quit.png   			\
 	stock-icons/24/gtk-redo-ltr.png       		\
@@ -965,6 +1170,12 @@ GENERATED_ICONS = \
 	stock-icons/16/gtk-media-previous-rtl.png     	\
 	stock-icons/16/gtk-media-rewind-rtl.png       	\
 	stock-icons/16/gtk-save.png			\
+	stock-icons/16/drive-harddisk.png		\
+	stock-icons/16/folder.png			\
+	stock-icons/16/folder-remote.png		\
+	stock-icons/16/user-home.png			\
+	stock-icons/16/user-desktop.png			\
+	stock-icons/16/text-x-generic.png		\
 	stock-icons/24/gtk-go-back-rtl.png    		\
 	stock-icons/24/gtk-go-forward-rtl.png 		\
 	stock-icons/24/gtk-goto-first-rtl.png 		\
@@ -973,37 +1184,74 @@ GENERATED_ICONS = \
 	stock-icons/24/gtk-media-next-rtl.png 		\
 	stock-icons/24/gtk-media-previous-rtl.png     	\
 	stock-icons/24/gtk-media-rewind-rtl.png       	\
-	stock-icons/24/gtk-save.png
-
+	stock-icons/24/gtk-save.png			\
+	stock-icons/24/drive-harddisk.png		\
+	stock-icons/24/folder.png			\
+	stock-icons/24/folder-remote.png		\
+	stock-icons/24/user-home.png			\
+	stock-icons/24/user-desktop.png			\
+	stock-icons/24/text-x-generic.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)
-	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)				\
-	done									\
+	if [ ! -d stock-icons ]; then 					\
+	  for d in 16 20 24 32 48; do 					\
+	    mkdir -p stock-icons/$$d; 					\
+	  done;								\
+	  for f in $(STOCK_ICONS); do					\
+	    cp $(srcdir)/$$f $$(dirname $$f);				\
+	  done;								\
+	  chmod -R u+w stock-icons;					\
+        fi &&								\
+	for i in 16 24; do						\
+	   (cd stock-icons/$$i						\
+	   && $(RM) gtk-go-back-rtl.png 				\
+	   && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png	\
+	   && $(RM) gtk-go-forward-rtl.png				\
+	   && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png	\
+	   && $(RM) gtk-goto-first-rtl.png 				\
+	   && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png	\
+	   && $(RM) gtk-goto-last-rtl.png				\
+	   && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png	\
+	   && $(RM) gtk-media-forward-rtl.png 				\
+	   && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png\
+	   && $(RM) gtk-media-next-rtl.png				\
+	   && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png	\
+	   && $(RM) gtk-media-previous-rtl.png 				\
+	   && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png	\
+	   && $(RM) gtk-media-rewind-rtl.png				\
+	   && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png\
+	   && $(RM) gtk-save.png					\
+	   && $(LN_S) gtk-floppy.png gtk-save.png			\
+	   && $(RM) drive-harddisk.png					\
+	   && $(LN_S) gtk-harddisk.png drive-harddisk.png		\
+	   && $(RM) folder.png						\
+	   && $(LN_S) gtk-directory.png folder.png			\
+	   && $(RM) folder-remote.png					\
+	   && $(LN_S) gtk-directory.png folder-remote.png		\
+	   && $(RM) user-home.png					\
+	   && $(LN_S) gtk-directory.png user-home.png			\
+	   && $(RM) user-desktop.png					\
+	   && $(LN_S) gtk-directory.png user-desktop.png		\
+	   && $(RM) text-x-generic.png					\
+	   && $(LN_S) gtk-file.png text-x-generic.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 stock-icons > gtkbuiltincache.h
+if CROSS_COMPILING
+gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+else
+gtk_update_icon_cache_program =							\
+	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
+	   ./gtk-update-icon-cache
+endif
 
-MAINTAINERCLEANFILES += stamp-icons
+gtkbuiltincache.h: @REBUILD@ stamp-icons
+	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
 
 EXTRA_DIST +=                   \
 	$(STOCK_ICONS)		\
@@ -1015,17 +1263,26 @@ EXTRA_DIST +=                   \
 	tree_minus.xpm		\
 	tree_plus.xpm		\
 	gtk.def			\
+	gtk-builder-convert	\
 	gtk-win32.rc		\
 	gtk-win32.rc.in		\
 	gtkwin32embed.h		\
-	gtkfilesystemwin32.h	\
-	gtkfilesystemwin32.c	\
+	gtkwin32embedwidget.h	\
+	gtkwin32embedwidget.c	\
+	gtkprint-win32.h	\
+	gtkprint-win32.c	\
+	gtksearchenginequartz.h \
 	gtkrc.default		\
 	gtkrc.key.default	\
 	gtkrc.key.emacs		\
 	makefile.msc		\
 	makefile.msc.in		\
 	makegtkalias.pl		\
-	abicheck.sh
+	aliasfilescheck.sh	\
+	abicheck.sh		\
+	pltcheck.sh		\
+	gtktypebuiltins.c.template      \
+	gtktypebuiltins.h.template
+
 
 install-data-local: