]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Merge branch 'master' into broadway
[~andy/gtk] / gtk / Makefile.am
index 43e14fc18a3e3590ae0fd55c9722dd6f0ea7ce72..d740dae1f74ce3a1180a03fa6354e58a392dbf9c 100644 (file)
@@ -3,12 +3,10 @@ include $(top_srcdir)/Makefile.decl
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
-       --add-include-path=../gdk-pixbuf \
        --add-include-path=../gdk
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
     --includedir=. \
-    --includedir=../gdk-pixbuf \
     --includedir=../gdk
 
 if USE_QUARTZ
@@ -18,7 +16,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
 endif
 
 SUBDIRS = theme-bits . tests
-DIST_SUBDIRS=theme-bits tests
+DIST_SUBDIRS = theme-bits tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -50,7 +48,6 @@ INCLUDES =                                            \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
-       -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
@@ -104,27 +101,15 @@ 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') > $(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
+       (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
-TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS += abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd =                                                               \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(GTK_DEP_LIBS)
 deps =
@@ -133,6 +118,7 @@ deps =
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
 libtool_opts =                                                 \
+  $(GTK_LINK_FLAGS)                                            \
   -version-info $(LT_VERSION_INFO)                             \
   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)    \
   -rpath $(libdir) $(libgtk_target_ldflags)
@@ -170,13 +156,18 @@ gtk_public_h_sources =          \
        gtkactivatable.h        \
        gtkadjustment.h         \
        gtkalignment.h          \
-       gtkapplication.h    \
+       gtkappchooser.h         \
+       gtkappchooserdialog.h   \
+       gtkappchooserbutton.h   \
+       gtkappchooserwidget.h   \
+       gtkapplication.h        \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkassistant.h          \
        gtkbbox.h               \
        gtkbin.h                \
        gtkbindings.h           \
+       gtkborder.h             \
        gtkbox.h                \
        gtkbuilder.h            \
        gtkbuildable.h          \
@@ -189,7 +180,7 @@ gtk_public_h_sources =          \
        gtkcellrenderercombo.h  \
        gtkcellrendererpixbuf.h \
        gtkcellrendererprogress.h \
-       gtkcellrendererspin.h   \
+       gtkcellrendererspin.h   \
        gtkcellrendererspinner.h\
        gtkcellrenderertext.h   \
        gtkcellrenderertoggle.h \
@@ -201,34 +192,35 @@ gtk_public_h_sources =          \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombobox.h           \
-       gtkcomboboxentry.h      \
+       gtkcomboboxtext.h       \
        gtkcontainer.h          \
-       gtkdebug.h              \
+       gtkcssprovider.h        \
+       gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
        gtkdrawingarea.h        \
-       gtkeditable.h           \
+       gtkeditable.h           \
        gtkentry.h              \
        gtkentrybuffer.h        \
        gtkentrycompletion.h    \
        gtkenums.h              \
        gtkeventbox.h           \
        gtkexpander.h           \
-       gtkfilechooser.h        \
-       gtkfilechooserbutton.h  \
-       gtkfilechooserdialog.h  \
-       gtkfilechooserwidget.h  \
+       gtkfilechooser.h        \
+       gtkfilechooserbutton.h  \
+       gtkfilechooserdialog.h  \
+       gtkfilechooserwidget.h  \
        gtkfilefilter.h         \
        gtkfixed.h              \
        gtkfontbutton.h         \
        gtkfontsel.h            \
        gtkframe.h              \
-       gtkgc.h                 \
+       gtkgradient.h           \
+       gtkgrid.h               \
        gtkhandlebox.h          \
        gtkhbbox.h              \
        gtkhbox.h               \
        gtkhpaned.h             \
-       gtkhruler.h             \
        gtkhscale.h             \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
@@ -244,9 +236,8 @@ gtk_public_h_sources =          \
        gtkimmulticontext.h     \
        gtkinfobar.h            \
        gtkinvisible.h          \
-       gtkitem.h               \
        gtklabel.h              \
-       gtklayout.h             \
+       gtklayout.h             \
        gtklinkbutton.h         \
        gtkliststore.h          \
        gtkmain.h               \
@@ -258,9 +249,8 @@ gtk_public_h_sources =          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
        gtkmodules.h            \
-       gtkmountoperation.h     \
+       gtkmountoperation.h     \
        gtknotebook.h           \
-       gtkobject.h             \
        gtkoffscreenwindow.h    \
        gtkorientable.h         \
        gtkpagesetup.h          \
@@ -269,9 +259,8 @@ gtk_public_h_sources =          \
        gtkplug.h               \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
-       gtkprintoperationpreview.h      \
+       gtkprintoperationpreview.h \
        gtkprintsettings.h      \
-       gtkprivate.h            \
        gtkprogressbar.h        \
        gtkradioaction.h        \
        gtkradiobutton.h        \
@@ -282,13 +271,13 @@ gtk_public_h_sources =          \
        gtkrecentaction.h       \
        gtkrecentchooser.h      \
        gtkrecentchooserdialog.h \
-       gtkrecentchoosermenu.h  \
+       gtkrecentchoosermenu.h  \
        gtkrecentchooserwidget.h \
-       gtkrecentfilter.h       \
+       gtkrecentfilter.h       \
        gtkrecentmanager.h      \
-       gtkruler.h              \
        gtkscale.h              \
        gtkscalebutton.h        \
+       gtkscrollable.h         \
        gtkscrollbar.h          \
        gtkscrolledwindow.h     \
        gtkselection.h          \
@@ -305,9 +294,14 @@ gtk_public_h_sources =          \
        gtkstatusbar.h          \
        gtkstatusicon.h         \
        gtkstock.h              \
+       gtkstylecontext.h       \
+       gtkstyleproperties.h    \
+       gtkstyleprovider.h      \
        gtkstyle.h              \
+       gtkswitch.h             \
+       gtksymboliccolor.h      \
        gtktable.h              \
-       gtktearoffmenuitem.h    \
+       gtktearoffmenuitem.h    \
        gtktestutils.h          \
        gtktextbuffer.h         \
        gtktextbufferrichtext.h \
@@ -318,6 +312,7 @@ gtk_public_h_sources =          \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
+       gtkthemingengine.h      \
        gtktoggleaction.h       \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
@@ -344,11 +339,11 @@ gtk_public_h_sources =          \
        gtkviewport.h           \
        gtkvolumebutton.h       \
        gtkvpaned.h             \
-       gtkvruler.h             \
        gtkvscale.h             \
        gtkvscrollbar.h         \
        gtkvseparator.h         \
        gtkwidget.h             \
+       gtkwidgetpath.h         \
        gtkwindow.h
 
 if OS_UNIX
@@ -365,36 +360,59 @@ endif
 gtk_semi_private_h_sources =    \
        gtktextlayout.h
 
+if ENABLE_PACKAGEKIT
+gtk_appchooser_impl_h_sources = \
+       gtkappchooseronlinepk.h \
+       $(NULL)
+endif
+
+if ENABLE_PACKAGEKIT
+gtk_appchooser_impl_c_sources = \
+       gtkappchooseronlinepk.c \
+       $(NULL)
+endif
+
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
+       gtk9slice.h             \
+       gtkbuttonprivate.h      \
        gtkquery.h              \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
+       gtkanimationdescription.h \
        gtkbuilderprivate.h     \
        gtkcustompaperunixdialog.h\
        gtkfilechooserdefault.h \
        gtkfilechooserembed.h   \
        gtkfilechooserentry.h   \
        gtkfilechooserprivate.h \
-       gtkfilechoosersettings.h \
        gtkfilechooserutils.h   \
        gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
        gtkiconcache.h          \
+       gtkimcontextsimpleseqs.h   \
        gtkintl.h               \
        gtkkeyhash.h            \
+       gtkmenuprivate.h        \
        gtkmnemonichash.h       \
+       gtkmodifierstyle.h      \
        gtkmountoperationprivate.h \
+       gtkappchooserprivate.h  \
+       gtkappchoosermodule.h   \
+       gtkappchooseronline.h   \
+       gtkpango.h              \
        gtkpathbar.h            \
        gtkplugprivate.h        \
        gtkprintoperation-private.h\
        gtkprintutils.h         \
+       gtkprivate.h            \
        gtkrbtree.h             \
        gtkrecentchooserdefault.h \
        gtkrecentchooserprivate.h \
        gtkrecentchooserutils.h \
+       gtksizegroup-private.h  \
        gtksocketprivate.h      \
        gtktextbtree.h          \
        gtktextbufferserialize.h\
@@ -405,16 +423,19 @@ gtk_private_h_sources =           \
        gtktexttagprivate.h     \
        gtktexttypes.h          \
        gtktextutil.h           \
+       gtktimeline.h           \
        gtkthemes.h             \
-       gtktoggleactionprivate.h\
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwindow-decorate.h    \
-       $(gtk_clipboard_dnd_h_sources)
+       gtkwidgetprivate.h      \
+       $(gtk_clipboard_dnd_h_sources) \
+       $(gtk_appchooser_impl_h_sources)
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =            \
+       gtk9slice.c             \
        gtkquery.c              \
        gtksearchengine.c       \
        gtksearchenginesimple.c \
@@ -429,13 +450,21 @@ gtk_base_c_sources =            \
        gtkactivatable.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
-       gtkapplication.c \
+       gtkappchooser.c         \
+       gtkappchooserwidget.c   \
+       gtkappchooserbutton.c   \
+       gtkappchooserdialog.c   \
+       gtkappchoosermodule.c   \
+       gtkappchooseronline.c   \
+       gtkapplication.c        \
+       gtkanimationdescription.c \
        gtkarrow.c              \
        gtkaspectframe.c        \
        gtkassistant.c          \
        gtkbbox.c               \
        gtkbin.c                \
        gtkbindings.c           \
+       gtkborder.c             \
        gtkbox.c                \
        gtkbuildable.c          \
        gtkbuilder.c            \
@@ -460,11 +489,12 @@ gtk_base_c_sources =            \
        gtkcolorsel.c           \
        gtkcolorseldialog.c     \
        gtkcombobox.c           \
-       gtkcomboboxentry.c      \
+       gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcssprovider.c        \
        gtkdialog.c             \
        gtkdrawingarea.c        \
-       gtkeditable.c           \
+       gtkeditable.c           \
        gtkentry.c              \
        gtkentrybuffer.c        \
        gtkentrycompletion.c    \
@@ -476,22 +506,21 @@ gtk_base_c_sources =            \
        gtkfilechooserdialog.c  \
        gtkfilechooserembed.c   \
        gtkfilechooserentry.c   \
-       gtkfilechoosersettings.c \
        gtkfilechooserutils.c   \
        gtkfilechooserwidget.c  \
        gtkfilefilter.c         \
        gtkfilesystem.c         \
        gtkfilesystemmodel.c    \
        gtkfixed.c              \
-       gtkfontbutton.c         \
-       gtkfontsel.c            \
+       gtkfontbutton.c         \
+       gtkfontsel.c            \
        gtkframe.c              \
-       gtkgc.c                 \
+       gtkgradient.c           \
+       gtkgrid.c               \
        gtkhandlebox.c          \
        gtkhbbox.c              \
        gtkhbox.c               \
        gtkhpaned.c             \
-       gtkhruler.c             \
        gtkhscale.c             \
        gtkhscrollbar.c         \
        gtkhseparator.c         \
@@ -509,7 +538,6 @@ gtk_base_c_sources =            \
        gtkimmulticontext.c     \
        gtkinfobar.c            \
        gtkinvisible.c          \
-       gtkitem.c               \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
@@ -525,20 +553,21 @@ gtk_base_c_sources =            \
        gtkmessagedialog.c      \
        gtkmisc.c               \
        gtkmnemonichash.c       \
+       gtkmodifierstyle.c      \
        gtkmodules.c            \
-       gtkmountoperation.c     \
+       gtkmountoperation.c     \
        gtknotebook.c           \
-       gtkobject.c             \
        gtkoffscreenwindow.c    \
        gtkorientable.c         \
        gtkpagesetup.c          \
        gtkpaned.c              \
+       gtkpango.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
        gtkplug.c               \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
-       gtkprintoperationpreview.c      \
+       gtkprintoperationpreview.c \
        gtkprintsettings.c      \
        gtkprintutils.c         \
        gtkprogressbar.c        \
@@ -547,20 +576,20 @@ gtk_base_c_sources =            \
        gtkradiomenuitem.c      \
        gtkradiotoolbutton.c    \
        gtkrange.c              \
-       gtkrbtree.c             \
+       gtkrbtree.c             \
        gtkrc.c                 \
        gtkrecentaction.c       \
        gtkrecentchooserdefault.c \
-       gtkrecentchooserdialog.c \
-       gtkrecentchoosermenu.c  \
-       gtkrecentchooserwidget.c \
+       gtkrecentchooserdialog.c\
+       gtkrecentchoosermenu.c  \
+       gtkrecentchooserwidget.c\
        gtkrecentchooserutils.c \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
-       gtkruler.c              \
        gtkscale.c              \
        gtkscalebutton.c        \
+       gtkscrollable.c         \
        gtkscrollbar.c          \
        gtkscrolledwindow.c     \
        gtkselection.c          \
@@ -577,9 +606,14 @@ gtk_base_c_sources =            \
        gtkstatusbar.c          \
        gtkstatusicon.c         \
        gtkstock.c              \
+       gtkstylecontext.c       \
+       gtkstyleproperties.c    \
+       gtkstyleprovider.c      \
        gtkstyle.c              \
+       gtkswitch.c             \
+       gtksymboliccolor.c      \
        gtktable.c              \
-       gtktearoffmenuitem.c    \
+       gtktearoffmenuitem.c    \
        gtktestutils.c          \
        gtktextbtree.c          \
        gtktextbuffer.c         \
@@ -597,13 +631,15 @@ gtk_base_c_sources =            \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemes.c             \
+       gtkthemingengine.c      \
+       gtktimeline.c           \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
-       gtktoolitemgroup.c              \
+       gtktoolitemgroup.c      \
        gtktoolpalette.c        \
        gtktoolshell.c          \
        gtktooltip.c            \
@@ -625,14 +661,15 @@ gtk_base_c_sources =            \
        gtkvolumebutton.c       \
        gtkviewport.c           \
        gtkvpaned.c             \
-       gtkvruler.c             \
        gtkvscale.c             \
        gtkvscrollbar.c         \
        gtkvseparator.c         \
        gtkwidget.c             \
-       gtkwindow-decorate.c    \
+       gtkwidgetpath.c         \
+       gtkwindow-decorate.c    \
        gtkwindow.c             \
-       $(gtk_clipboard_dnd_c_sources)
+       $(gtk_clipboard_dnd_c_sources) \
+       $(gtk_appchooser_impl_c_sources)
 
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
@@ -735,13 +772,10 @@ gtk_built_public_sources =                        \
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
-       gtkalias.h                              \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h                       \
-       gtkimcontextsimpleseqs.h
+       gtkbuiltincache.h
 
 gtk_built_sources =                            \
-       gtkaliasdef.c                           \
        gtktypebuiltins.c                       \
        gtktypefuncs.c                          \
        gtkmarshalers.c                         \
@@ -797,7 +831,6 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
        && echo timestamp > $(@F)       
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
        (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
@@ -819,9 +852,9 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 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' | \
+         $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
-         sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+         $(SED) '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
@@ -834,30 +867,30 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
+libgtk_broadway_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources)
 
+libgtk_broadway_3_0_la_LDFLAGS = $(libtool_opts)
 libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
 libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
 
+libgtk_broadway_3_0_la_LIBADD = $(libadd)
 libgtk_x11_3_0_la_LIBADD = $(libadd)
 libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_quartz_3_0_la_LIBADD = $(libadd)
-libgtk_directfb_3_0_la_LIBADD = $(libadd)
 
+libgtk_broadway_3_0_la_DEPENDENCIES = $(deps)
 libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
 libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
-libgtk_directfb_3_0_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la
+EXTRA_LTLIBRARIES = libgtk-broadway-3.0.la libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
@@ -908,25 +941,27 @@ distclean-local:
          rm -f $(MAINTAINERCLEANFILES); \
        fi
 
-DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
+DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
 
 TEST_DEPS = $(DEPS) immodules.cache
 
 LDADDS =                                                               \
        $(gtktargetlib)                                                 \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
 introspection_files = \
-    $(gtkinclude_HEADERS) \
-    $(gtk_all_c_sources) \
+    $(filter-out %private.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
+    $(gtk_base_c_sources) \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
 Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
+Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
+if USE_X11
+Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+endif
 Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
 Gtk_3_0_gir_CFLAGS = \
                $(INCLUDES) \
@@ -934,7 +969,10 @@ Gtk_3_0_gir_CFLAGS = \
                -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 Gtk_3_0_gir_LIBS = $(gtktargetlib)
-Gtk_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+if USE_X11
+Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la
+endif
+Gtk_3_0_gir_FILES = $(introspection_files)
 INTROSPECTION_GIRS += Gtk-3.0.gir
 
 girdir = $(datadir)/gir-1.0
@@ -960,19 +998,19 @@ if OS_WIN32
 # Workaround for UAC silliness: programs with "update" in their name
 # are believed to be installers and require elevated privileges to be
 # used... Use a manifest file to tell Windows that
-# gtk-update-icon-cache.exe doesn't require any special privileges.
+# gtk-update-icon-cache-3.0.exe doesn't require any special privileges.
 
-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache-3.0.exe.manifest
 
 bin_SCRIPTS += \
        $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 
-gtk-update-icon-cache.exe.manifest:
+$(GTK_UPDATE_ICON_CACHE_MANIFEST):
        (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
         echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
         echo '  <assemblyIdentity version="1.0.0.0"' ; \
         echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
-        echo '     name="gtk-update-icon-cache.exe"' ; \
+        echo '     name="gtk-update-icon-cache-3.0.exe"' ; \
         echo '     type="win32"/>' ; \
         echo '  <!-- Identify the application security requirements. -->' ; \
         echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
@@ -990,16 +1028,10 @@ endif
 
 gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_3_0_LDADD = $(LDADDS)
-
 gtk_query_immodules_3_0_SOURCES = queryimmodules.c
 
-gtk_update_icon_cache_3_0_LDADD = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-       $(GDK_PIXBUF_DEP_LIBS)
-
-
-gtk_update_icon_cache_3_0_SOURCES = \
-       updateiconcache.c 
+gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS)
+gtk_update_icon_cache_3_0_SOURCES = updateiconcache.c
 
 .PHONY: files test test-debug
 
@@ -1010,247 +1042,243 @@ files:
 
 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                     \
-       stock-icons/16/gtk-cut.png                      \
-       stock-icons/16/gtk-delete.png                   \
-       stock-icons/16/gtk-directory.png                \
-       stock-icons/16/gtk-disconnect.png               \
-       stock-icons/16/gtk-edit.png                     \
-       stock-icons/16/gtk-execute.png                  \
-       stock-icons/16/gtk-file.png                     \
-       stock-icons/16/gtk-find-and-replace.png         \
-       stock-icons/16/gtk-find.png                     \
-       stock-icons/16/gtk-floppy.png                   \
-       stock-icons/16/gtk-fullscreen.png               \
-       stock-icons/16/gtk-go-back-ltr.png              \
-       stock-icons/16/gtk-go-down.png                  \
-       stock-icons/16/gtk-go-forward-ltr.png           \
-       stock-icons/16/gtk-goto-bottom.png              \
-       stock-icons/16/gtk-goto-first-ltr.png           \
-       stock-icons/16/gtk-goto-last-ltr.png            \
-       stock-icons/16/gtk-goto-top.png                 \
-       stock-icons/16/gtk-go-up.png                    \
-       stock-icons/16/gtk-harddisk.png                 \
-       stock-icons/16/gtk-help.png                     \
-       stock-icons/16/gtk-home.png                     \
-       stock-icons/16/gtk-indent-ltr.png               \
-       stock-icons/16/gtk-indent-rtl.png               \
-       stock-icons/16/gtk-index.png                    \
-       stock-icons/16/gtk-info.png                     \
-       stock-icons/16/gtk-jump-to-ltr.png              \
-       stock-icons/16/gtk-jump-to-rtl.png              \
-       stock-icons/16/gtk-justify-center.png           \
-       stock-icons/16/gtk-justify-fill.png             \
-       stock-icons/16/gtk-justify-left.png             \
-       stock-icons/16/gtk-justify-right.png            \
-       stock-icons/16/gtk-leave-fullscreen.png         \
-       stock-icons/16/gtk-media-forward-ltr.png        \
-       stock-icons/16/gtk-media-next-ltr.png           \
-       stock-icons/16/gtk-media-pause.png              \
-       stock-icons/16/gtk-media-play-ltr.png           \
-       stock-icons/16/gtk-media-play-rtl.png           \
-       stock-icons/16/gtk-media-previous-ltr.png       \
-       stock-icons/16/gtk-media-record.png             \
-       stock-icons/16/gtk-media-rewind-ltr.png         \
-       stock-icons/16/gtk-media-stop.png               \
-       stock-icons/16/gtk-missing-image.png            \
-       stock-icons/16/gtk-network.png                  \
-       stock-icons/16/gtk-new.png                      \
-       stock-icons/16/gtk-open.png                     \
+       stock-icons/16/help-about.png                   \
+       stock-icons/16/list-add.png                     \
+       stock-icons/16/media-optical.png                \
+       stock-icons/16/window-close.png                 \
+       stock-icons/16/gtk-connect.png                  \
+       stock-icons/16/gtk-convert.png                  \
+       stock-icons/16/edit-copy.png                    \
+       stock-icons/16/edit-cut.png                     \
+       stock-icons/16/edit-delete.png                  \
+       stock-icons/16/folder.png                       \
+       stock-icons/16/gtk-disconnect.png               \
+       stock-icons/16/gtk-edit.png                     \
+       stock-icons/16/system-run.png                   \
+       stock-icons/16/document-x-generic.png           \
+       stock-icons/16/edit-find-replace.png            \
+       stock-icons/16/edit-find.png                    \
+       stock-icons/16/media-floppy.png                 \
+       stock-icons/16/view-fullscreen.png              \
+       stock-icons/16/go-previous-ltr.png              \
+       stock-icons/16/go-down.png                      \
+       stock-icons/16/go-next-ltr.png                  \
+       stock-icons/16/go-bottom.png                    \
+       stock-icons/16/go-first-ltr.png                 \
+       stock-icons/16/go-last-ltr.png                  \
+       stock-icons/16/go-top.png                       \
+       stock-icons/16/go-up.png                        \
+       stock-icons/16/drive-harddisk.png               \
+       stock-icons/16/help-contents.png                \
+       stock-icons/16/go-home.png                      \
+       stock-icons/16/format-indent-more-ltr.png       \
+       stock-icons/16/format-indent-more-rtl.png       \
+       stock-icons/16/gtk-index.png                    \
+       stock-icons/16/dialog-information.png           \
+       stock-icons/16/go-jump-ltr.png                  \
+       stock-icons/16/go-jump-rtl.png                  \
+       stock-icons/16/format-justify-center.png        \
+       stock-icons/16/format-justify-fill.png          \
+       stock-icons/16/format-justify-left.png          \
+       stock-icons/16/format-justify-right.png         \
+       stock-icons/16/view-restore.png                 \
+       stock-icons/16/media-seek-forward-ltr.png       \
+       stock-icons/16/media-skip-forward-ltr.png       \
+       stock-icons/16/media-playback-pause.png         \
+       stock-icons/16/media-playback-start-ltr.png     \
+       stock-icons/16/media-playback-start-rtl.png     \
+       stock-icons/16/media-skip-backward-ltr.png      \
+       stock-icons/16/media-record.png                 \
+       stock-icons/16/media-seek-backward-ltr.png      \
+       stock-icons/16/media-playback-stop.png          \
+       stock-icons/16/image-missing.png                \
+       stock-icons/16/network-idle.png                 \
+       stock-icons/16/document-new.png                 \
+       stock-icons/16/document-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                 \
-       stock-icons/16/gtk-redo-rtl.png                 \
-       stock-icons/16/gtk-refresh.png                  \
-       stock-icons/16/gtk-remove.png                   \
-       stock-icons/16/gtk-revert-to-saved-ltr.png      \
-       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          \
-       stock-icons/16/gtk-spell-check.png              \
-       stock-icons/16/gtk-stop.png                     \
-       stock-icons/16/gtk-strikethrough.png            \
-       stock-icons/16/gtk-font.png                     \
-       stock-icons/16/gtk-undelete-ltr.png             \
-       stock-icons/16/gtk-undelete-rtl.png             \
-       stock-icons/16/gtk-underline.png                \
-       stock-icons/16/gtk-undo-ltr.png                 \
-       stock-icons/16/gtk-undo-rtl.png                 \
-       stock-icons/16/gtk-unindent-ltr.png             \
-       stock-icons/16/gtk-unindent-rtl.png             \
-       stock-icons/16/gtk-zoom-100.png                 \
-       stock-icons/16/gtk-zoom-fit.png                 \
-       stock-icons/16/gtk-zoom-in.png                  \
-       stock-icons/16/gtk-zoom-out.png                 \
-       stock-icons/16/gtk-italic.png                   \
-       stock-icons/16/gtk-bold.png                     \
+       stock-icons/16/edit-paste.png                   \
+       stock-icons/16/gtk-preferences.png              \
+       stock-icons/16/document-print.png               \
+       stock-icons/16/printer-error.png                \
+       stock-icons/16/printer-paused.png               \
+       stock-icons/16/document-print-preview.png       \
+       stock-icons/16/printer-info.png                 \
+       stock-icons/16/printer-warning.png              \
+       stock-icons/16/document-properties.png          \
+       stock-icons/16/application-exit.png             \
+       stock-icons/16/edit-redo-ltr.png                \
+       stock-icons/16/edit-redo-rtl.png                \
+       stock-icons/16/view-refresh.png                 \
+       stock-icons/16/list-remove.png                  \
+       stock-icons/16/document-revert-ltr.png          \
+       stock-icons/16/document-revert-rtl.png          \
+       stock-icons/16/document-save-as.png             \
+       stock-icons/16/edit-select-all.png              \
+       stock-icons/16/gtk-select-color.png             \
+       stock-icons/16/gtk-select-font.png              \
+       stock-icons/16/view-sort-ascending.png          \
+       stock-icons/16/view-sort-descending.png         \
+       stock-icons/16/tools-check-spelling.png         \
+       stock-icons/16/process-stop.png                 \
+       stock-icons/16/format-text-strikethrough.png    \
+       stock-icons/16/gtk-font.png                     \
+       stock-icons/16/gtk-undelete-ltr.png             \
+       stock-icons/16/gtk-undelete-rtl.png             \
+       stock-icons/16/format-text-underline.png        \
+       stock-icons/16/edit-undo-ltr.png                \
+       stock-icons/16/edit-undo-rtl.png                \
+       stock-icons/16/format-indent-less-ltr.png       \
+       stock-icons/16/format-indent-less-rtl.png       \
+       stock-icons/16/zoom-original.png                \
+       stock-icons/16/zoom-fit-best.png                \
+       stock-icons/16/zoom-in.png                      \
+       stock-icons/16/zoom-out.png                     \
+       stock-icons/16/format-text-italic.png           \
+       stock-icons/16/format-text-bold.png             \
        stock-icons/20/gtk-apply.png                    \
        stock-icons/20/gtk-cancel.png                   \
-       stock-icons/20/gtk-close.png                    \
-       stock-icons/20/gtk-no.png                       \
-       stock-icons/20/gtk-ok.png                       \
-       stock-icons/20/gtk-yes.png                      \
+       stock-icons/20/window-close.png                 \
+       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                     \
-       stock-icons/24/gtk-cdrom.png                    \
-       stock-icons/24/gtk-clear.png                    \
-       stock-icons/24/gtk-close.png                    \
-       stock-icons/24/gtk-color-picker.png             \
-       stock-icons/24/gtk-connect.png                  \
-       stock-icons/24/gtk-convert.png                  \
-       stock-icons/24/gtk-copy.png                     \
-       stock-icons/24/gtk-cut.png                      \
-       stock-icons/24/gtk-directory.png                \
-       stock-icons/24/gtk-disconnect.png               \
-       stock-icons/24/gtk-edit.png                     \
-       stock-icons/24/gtk-execute.png                  \
-       stock-icons/24/gtk-file.png                     \
-       stock-icons/24/gtk-find-and-replace.png         \
-       stock-icons/24/gtk-find.png                     \
-       stock-icons/24/gtk-font.png                     \
-       stock-icons/24/gtk-fullscreen.png               \
-       stock-icons/24/gtk-go-back-ltr.png              \
-       stock-icons/24/gtk-goto-top.png                 \
-       stock-icons/24/gtk-go-down.png                  \
-       stock-icons/24/gtk-goto-bottom.png              \
-       stock-icons/24/gtk-goto-first-ltr.png           \
-       stock-icons/24/gtk-goto-last-ltr.png            \
-       stock-icons/24/gtk-go-up.png                    \
-       stock-icons/24/gtk-harddisk.png                 \
-       stock-icons/24/gtk-help.png                     \
-       stock-icons/24/gtk-home.png                     \
-       stock-icons/24/gtk-indent-ltr.png               \
-       stock-icons/24/gtk-indent-rtl.png               \
+       stock-icons/24/help-about.png                   \
+       stock-icons/24/list-add.png                     \
+       stock-icons/24/format-text-bold.png             \
+       stock-icons/24/media-optical.png                \
+       stock-icons/24/edit-clear.png                   \
+       stock-icons/24/window-close.png                 \
+       stock-icons/24/gtk-color-picker.png             \
+       stock-icons/24/gtk-connect.png                  \
+       stock-icons/24/gtk-convert.png                  \
+       stock-icons/24/edit-copy.png                    \
+       stock-icons/24/edit-cut.png                     \
+       stock-icons/24/folder.png                       \
+       stock-icons/24/gtk-disconnect.png               \
+       stock-icons/24/gtk-edit.png                     \
+       stock-icons/24/system-run.png                   \
+       stock-icons/24/document-x-generic.png           \
+       stock-icons/24/edit-find-replace.png            \
+       stock-icons/24/edit-find.png                    \
+       stock-icons/24/gtk-font.png                     \
+       stock-icons/24/view-fullscreen.png              \
+       stock-icons/24/go-previous-ltr.png              \
+       stock-icons/24/go-top.png                       \
+       stock-icons/24/go-down.png                      \
+       stock-icons/24/go-bottom.png                    \
+       stock-icons/24/go-first-ltr.png                 \
+       stock-icons/24/go-last-ltr.png                  \
+       stock-icons/24/go-up.png                        \
+       stock-icons/24/drive-harddisk.png               \
+       stock-icons/24/help-contents.png                \
+       stock-icons/24/go-home.png                      \
+       stock-icons/24/format-indent-more-ltr.png       \
+       stock-icons/24/format-indent-more-rtl.png       \
        stock-icons/24/gtk-index.png                    \
-       stock-icons/24/gtk-info.png                     \
-       stock-icons/24/gtk-italic.png                   \
-       stock-icons/24/gtk-jump-to-ltr.png              \
-       stock-icons/24/gtk-jump-to-rtl.png              \
-       stock-icons/24/gtk-justify-center.png           \
-       stock-icons/24/gtk-justify-fill.png             \
-       stock-icons/24/gtk-justify-left.png             \
-       stock-icons/24/gtk-justify-right.png            \
-       stock-icons/24/gtk-leave-fullscreen.png         \
-       stock-icons/24/gtk-media-forward-ltr.png        \
-       stock-icons/24/gtk-media-next-ltr.png           \
-       stock-icons/24/gtk-media-pause.png              \
-       stock-icons/24/gtk-media-play-ltr.png           \
-       stock-icons/24/gtk-media-play-rtl.png           \
-       stock-icons/24/gtk-media-previous-ltr.png       \
-       stock-icons/24/gtk-media-record.png             \
-       stock-icons/24/gtk-media-rewind-ltr.png         \
-       stock-icons/24/gtk-media-stop.png               \
-       stock-icons/24/gtk-missing-image.png            \
-       stock-icons/24/gtk-network.png                  \
-       stock-icons/24/gtk-new.png                      \
-       stock-icons/24/gtk-open.png                     \
+       stock-icons/24/dialog-information.png           \
+       stock-icons/24/format-text-italic.png           \
+       stock-icons/24/go-jump-ltr.png                  \
+       stock-icons/24/go-jump-rtl.png                  \
+       stock-icons/24/format-justify-center.png        \
+       stock-icons/24/format-justify-fill.png          \
+       stock-icons/24/format-justify-left.png          \
+       stock-icons/24/format-justify-right.png         \
+       stock-icons/24/view-restore.png                 \
+       stock-icons/24/media-seek-forward-ltr.png       \
+       stock-icons/24/media-skip-forward-ltr.png       \
+       stock-icons/24/media-playback-pause.png         \
+       stock-icons/24/media-playback-start-ltr.png     \
+       stock-icons/24/media-playback-start-rtl.png     \
+       stock-icons/24/media-skip-backward-ltr.png      \
+       stock-icons/24/media-record.png                 \
+       stock-icons/24/media-seek-backward-ltr.png      \
+       stock-icons/24/media-playback-stop.png          \
+       stock-icons/24/image-missing.png                \
+       stock-icons/24/network-idle.png                 \
+       stock-icons/24/document-new.png                 \
+       stock-icons/24/document-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-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                 \
-       stock-icons/24/gtk-redo-rtl.png                 \
-       stock-icons/24/gtk-refresh.png                  \
-       stock-icons/24/gtk-remove.png                   \
-       stock-icons/24/gtk-revert-to-saved-ltr.png      \
-       stock-icons/24/gtk-revert-to-saved-rtl.png      \
-       stock-icons/24/gtk-select-font.png              \
-       stock-icons/24/gtk-save-as.png                  \
-       stock-icons/24/gtk-floppy.png                   \
-       stock-icons/24/gtk-select-all.png               \
+       stock-icons/24/edit-paste.png                   \
+       stock-icons/24/gtk-preferences.png              \
+       stock-icons/24/document-print.png               \
+       stock-icons/24/printer-error.png                \
+       stock-icons/24/printer-paused.png               \
+       stock-icons/24/document-print-preview.png       \
+       stock-icons/24/printer-info.png                 \
+       stock-icons/24/printer-warning.png              \
+       stock-icons/24/document-properties.png          \
+       stock-icons/24/application-exit.png             \
+       stock-icons/24/edit-redo-ltr.png                \
+       stock-icons/24/edit-redo-rtl.png                \
+       stock-icons/24/view-refresh.png                 \
+       stock-icons/24/list-remove.png                  \
+       stock-icons/24/document-revert-ltr.png          \
+       stock-icons/24/document-revert-rtl.png          \
+       stock-icons/24/gtk-select-font.png              \
+       stock-icons/24/document-save-as.png             \
+       stock-icons/24/media-floppy.png                 \
+       stock-icons/24/edit-select-all.png              \
        stock-icons/24/gtk-select-color.png             \
-       stock-icons/24/gtk-sort-ascending.png           \
-       stock-icons/24/gtk-sort-descending.png          \
-       stock-icons/24/gtk-spell-check.png              \
-       stock-icons/24/gtk-stop.png                     \
-       stock-icons/24/gtk-strikethrough.png            \
-       stock-icons/24/gtk-delete.png                   \
-       stock-icons/24/gtk-undelete-ltr.png             \
-       stock-icons/24/gtk-undelete-rtl.png             \
-       stock-icons/24/gtk-underline.png                \
-       stock-icons/24/gtk-undo-ltr.png                 \
-       stock-icons/24/gtk-undo-rtl.png                 \
-       stock-icons/24/gtk-unindent-ltr.png             \
-       stock-icons/24/gtk-unindent-rtl.png             \
-       stock-icons/24/gtk-zoom-100.png                 \
-       stock-icons/24/gtk-zoom-fit.png                 \
-       stock-icons/24/gtk-zoom-in.png                  \
-       stock-icons/24/gtk-zoom-out.png                 \
-       stock-icons/24/gtk-go-forward-ltr.png           \
-       stock-icons/32/gtk-dnd-multiple.png             \
-       stock-icons/32/gtk-dnd.png                      \
-       stock-icons/48/gtk-dialog-authentication.png    \
-       stock-icons/48/gtk-dialog-error.png             \
-       stock-icons/48/gtk-dialog-info.png              \
-       stock-icons/48/gtk-dialog-question.png          \
-       stock-icons/48/gtk-dialog-warning.png
+       stock-icons/24/view-sort-ascending.png          \
+       stock-icons/24/view-sort-descending.png         \
+       stock-icons/24/tools-check-spelling.png         \
+       stock-icons/24/process-stop.png                 \
+       stock-icons/24/format-text-strikethrough.png    \
+       stock-icons/24/edit-delete.png                  \
+       stock-icons/24/gtk-undelete-ltr.png             \
+       stock-icons/24/gtk-undelete-rtl.png             \
+       stock-icons/24/format-text-underline.png        \
+       stock-icons/24/edit-undo-ltr.png                \
+       stock-icons/24/edit-undo-rtl.png                \
+       stock-icons/24/format-indent-less-ltr.png       \
+       stock-icons/24/format-indent-less-rtl.png       \
+       stock-icons/24/zoom-original.png                \
+       stock-icons/24/zoom-fit-best.png                \
+       stock-icons/24/zoom-in.png                      \
+       stock-icons/24/zoom-out.png                     \
+       stock-icons/24/go-next-ltr.png                  \
+       stock-icons/32/gtk-dnd-multiple.png             \
+       stock-icons/32/gtk-dnd.png                      \
+       stock-icons/48/dialog-password.png              \
+       stock-icons/48/dialog-error.png                 \
+       stock-icons/48/dialog-information.png           \
+       stock-icons/48/dialog-question.png              \
+       stock-icons/48/dialog-warning.png
 
 GENERATED_ICONS = \
-       stock-icons/16/gtk-go-back-rtl.png              \
-       stock-icons/16/gtk-go-forward-rtl.png           \
-       stock-icons/16/gtk-goto-first-rtl.png           \
-       stock-icons/16/gtk-goto-last-rtl.png            \
-       stock-icons/16/gtk-media-forward-rtl.png        \
-       stock-icons/16/gtk-media-next-rtl.png           \
-       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           \
-       stock-icons/24/gtk-goto-last-rtl.png            \
-       stock-icons/24/gtk-media-forward-rtl.png        \
-       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/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/16/go-previous-rtl.png              \
+       stock-icons/16/go-next-rtl.png                  \
+       stock-icons/16/go-first-rtl.png                 \
+       stock-icons/16/go-last-rtl.png                  \
+       stock-icons/16/media-seek-forward-rtl.png       \
+       stock-icons/16/media-skip-forward-rtl.png       \
+       stock-icons/16/media-skip-backward-rtl.png      \
+       stock-icons/16/media-seek-backward-rtl.png      \
+       stock-icons/16/document-save.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/go-previous-rtl.png              \
+       stock-icons/24/go-next-rtl.png                  \
+       stock-icons/24/go-first-rtl.png                 \
+       stock-icons/24/go-last-rtl.png                  \
+       stock-icons/24/media-seek-forward-rtl.png       \
+       stock-icons/24/media-skip-forward-rtl.png       \
+       stock-icons/24/media-skip-backward-rtl.png      \
+       stock-icons/24/media-seek-backward-rtl.png      \
+       stock-icons/24/document-save.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
@@ -1267,44 +1295,39 @@ stamp-icons: $(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                                                          \
+          && $(RM) go-previous-rtl.png                                 \
+          && $(LN_S) go-next-ltr.png go-previous-rtl.png               \
+          && $(RM) go-next-rtl.png                                     \
+          && $(LN_S) go-previous-ltr.png go-next-rtl.png               \
+          && $(RM) go-first-rtl.png                                    \
+          && $(LN_S) go-last-ltr.png go-first-rtl.png                  \
+          && $(RM) go-last-rtl.png                                     \
+          && $(LN_S) go-first-ltr.png go-last-rtl.png                  \
+          && $(RM) media-seek-forward-rtl.png                          \
+          && $(LN_S) media-seek-backward-ltr.png media-seek-forward-rtl.png \
+          && $(RM) media-skip-forward-rtl.png                          \
+          && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
+          && $(RM) media-skip-backward-rtl.png                         \
+          && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
+          && $(RM) media-seek-backward-rtl.png                         \
+          && $(LN_S) media-seek-forward-ltr.png media-seek-backward-rtl.png \
+          && $(RM) document-save.png                                   \
+          && $(LN_S) media-floppy.png document-save.png                \
+          && $(RM) folder-remote.png                                   \
+          && $(LN_S) folder.png folder-remote.png                      \
+          && $(RM) user-home.png                                       \
+          && $(LN_S) folder.png user-home.png                          \
+          && $(RM) user-desktop.png                                    \
+          && $(LN_S) folder.png user-desktop.png                       \
+          && $(RM) text-x-generic.png                                  \
+          && $(LN_S) document-x-generic.png text-x-generic.png         \
+       ) done                                                          \
        && touch stamp-icons
 
 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/loaders.cache \
           ./gtk-update-icon-cache-3.0
 endif
 
@@ -1339,13 +1362,15 @@ EXTRA_DIST +=                   \
        gtkrc.key.mac           \
        makefile.msc            \
        makefile.msc.in         \
-       makegtkalias.pl         \
-       aliasfilescheck.sh      \
        abicheck.sh             \
-       pltcheck.sh             \
-       gtktypebuiltins.c.template      \
-       gtktypebuiltins.h.template
+       gtktypebuiltins.c.template \
+       gtktypebuiltins.h.template \
+       org.gtk.Settings.FileChooser.gschema.xml
+
+gsettings_SCHEMAS = \
+       org.gtk.Settings.FileChooser.gschema.xml
 
+@GSETTINGS_RULES@
 
 install-data-local: