]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Really keep GtkBubbleWindow private
[~andy/gtk] / gtk / Makefile.am
index 827400150690bc4bd8881301899ca7fb72beac1c..e164c90c95dc09f686dbeb0045bdcc80730f9391 100644 (file)
@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = . tests
+SUBDIRS = a11y native . tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -32,7 +32,7 @@ endif
 endif
 endif
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
        -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATADIR=\"$(datadir)\"                    \
@@ -48,13 +48,11 @@ INCLUDES =                                          \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
-       -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
+       $(GMODULE_CFLAGS)                               \
        $(GTK_DEBUG_FLAGS)                              \
        $(GTK_DEP_CFLAGS)                               \
-       $(gtk_clipboard_dnd_c_sources_CFLAGS)           \
        $(INCLUDED_IMMODULE_DEFINE)
 
 if PLATFORM_WIN32
@@ -99,7 +97,7 @@ 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
-       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
+       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/     /') > $(srcdir)/gtk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
 if OS_LINUX
@@ -109,8 +107,12 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
        $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/a11y/libgtka11y.la \
+       $(GMODULE_LIBS) \
        $(GTK_DEP_LIBS)
-deps =
+deps = \
+       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/a11y/libgtka11y.la
 
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -141,14 +143,46 @@ endif
 
 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
+
+deprecated_h_sources =                         \
+       deprecated/gtkcolorsel.h        \
+       deprecated/gtkcolorseldialog.h  \
+       deprecated/gtkfontsel.h         \
+       deprecated/gtkgradient.h        \
+       deprecated/gtkhandlebox.h       \
+       deprecated/gtkhbbox.h           \
+       deprecated/gtkhbox.h            \
+       deprecated/gtkhpaned.h          \
+       deprecated/gtkhscale.h          \
+       deprecated/gtkhscrollbar.h      \
+       deprecated/gtkhseparator.h      \
+       deprecated/gtkhsv.h             \
+       deprecated/gtkrc.h              \
+       deprecated/gtkstyle.h           \
+       deprecated/gtksymboliccolor.h   \
+       deprecated/gtktable.h           \
+       deprecated/gtktearoffmenuitem.h \
+       deprecated/gtkvbbox.h           \
+       deprecated/gtkvbox.h            \
+       deprecated/gtkvscale.h          \
+       deprecated/gtkvscrollbar.h      \
+       deprecated/gtkvseparator.h      \
+       deprecated/gtkvpaned.h
+
+deprecated_private_h_sources =                 \
+       deprecated/gtkgradientprivate.h         \
+       deprecated/gtksymboliccolorprivate.h
+
 gtk_public_h_sources =                 \
        gtk.h                   \
        gtkx.h                  \
+       gtk-a11y.h              \
        gtkaboutdialog.h        \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
        gtkaccelmap.h           \
        gtkaccessible.h         \
+       gtkactionable.h         \
        gtkaction.h             \
        gtkactiongroup.h        \
        gtkactivatable.h        \
@@ -159,6 +193,7 @@ gtk_public_h_sources =              \
        gtkappchooserdialog.h   \
        gtkappchooserwidget.h   \
        gtkapplication.h        \
+       gtkapplicationwindow.h  \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkassistant.h          \
@@ -190,12 +225,15 @@ gtk_public_h_sources =            \
        gtkcheckmenuitem.h      \
        gtkclipboard.h          \
        gtkcolorbutton.h        \
-       gtkcolorsel.h           \
-       gtkcolorseldialog.h     \
+       gtkcolorchooser.h       \
+       gtkcolorchooserwidget.h \
+       gtkcolorchooserdialog.h \
+       gtkcolorutils.h         \
        gtkcombobox.h           \
        gtkcomboboxtext.h       \
        gtkcontainer.h          \
        gtkcssprovider.h        \
+       gtkcsssection.h         \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
@@ -214,24 +252,18 @@ gtk_public_h_sources =            \
        gtkfilefilter.h         \
        gtkfixed.h              \
        gtkfontbutton.h         \
-       gtkfontsel.h            \
+       gtkfontchooser.h        \
+       gtkfontchooserdialog.h  \
+       gtkfontchooserwidget.h  \
        gtkframe.h              \
-       gtkgradient.h           \
        gtkgrid.h               \
-       gtkhandlebox.h          \
-       gtkhbbox.h              \
-       gtkhbox.h               \
-       gtkhpaned.h             \
-       gtkhscale.h             \
-       gtkhscrollbar.h         \
-       gtkhseparator.h         \
-       gtkhsv.h                \
        gtkiconfactory.h        \
        gtkicontheme.h          \
        gtkiconview.h           \
        gtkimage.h              \
        gtkimagemenuitem.h      \
        gtkimcontext.h          \
+       gtkimcontextinfo.h      \
        gtkimcontextsimple.h    \
        gtkimmodule.h           \
        gtkimmulticontext.h     \
@@ -239,11 +271,14 @@ gtk_public_h_sources =            \
        gtkinvisible.h          \
        gtklabel.h              \
        gtklayout.h             \
+       gtklevelbar.h           \
        gtklinkbutton.h         \
        gtkliststore.h          \
+       gtklockbutton.h         \
        gtkmain.h               \
        gtkmenu.h               \
        gtkmenubar.h            \
+       gtkmenubutton.h         \
        gtkmenuitem.h           \
        gtkmenushell.h          \
        gtkmenutoolbutton.h     \
@@ -255,6 +290,7 @@ gtk_public_h_sources =              \
        gtknumerableicon.h      \
        gtkoffscreenwindow.h    \
        gtkorientable.h         \
+       gtkoverlay.h            \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
@@ -269,7 +305,6 @@ gtk_public_h_sources =              \
        gtkradiomenuitem.h      \
        gtkradiotoolbutton.h    \
        gtkrange.h              \
-       gtkrc.h                 \
        gtkrecentaction.h       \
        gtkrecentchooser.h      \
        gtkrecentchooserdialog.h \
@@ -282,6 +317,7 @@ gtk_public_h_sources =              \
        gtkscrollable.h         \
        gtkscrollbar.h          \
        gtkscrolledwindow.h     \
+       gtksearchentry.h        \
        gtkselection.h          \
        gtkseparator.h          \
        gtkseparatormenuitem.h  \
@@ -299,11 +335,7 @@ gtk_public_h_sources =             \
        gtkstylecontext.h       \
        gtkstyleproperties.h    \
        gtkstyleprovider.h      \
-       gtkstyle.h              \
        gtkswitch.h             \
-       gtksymboliccolor.h      \
-       gtktable.h              \
-       gtktearoffmenuitem.h    \
        gtktestutils.h          \
        gtktextattributes.h     \
        gtktextbuffer.h         \
@@ -335,15 +367,10 @@ gtk_public_h_sources =            \
        gtktreestore.h          \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
+       gtktypes.h              \
        gtkuimanager.h          \
-       gtkvbbox.h              \
-       gtkvbox.h               \
        gtkviewport.h           \
        gtkvolumebutton.h       \
-       gtkvpaned.h             \
-       gtkvscale.h             \
-       gtkvscrollbar.h         \
-       gtkvseparator.h         \
        gtkwidget.h             \
        gtkwidgetpath.h         \
        gtkwindow.h
@@ -372,22 +399,82 @@ gtk_appchooser_impl_c_sources = \
        gtkappchooseronlinepk.c
 endif
 
+gtk_private_type_h_sources =   \
+       gtkcsstypesprivate.h    \
+       gtktexthandleprivate.h
+
+
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
-       gtk9slice.h             \
+       gactionmuxer.h          \
+       gactionobserver.h       \
+       gactionobservable.h     \
+       gtkapplicationprivate.h \
        gtkaccelgroupprivate.h  \
-       gtkaccessibleprivate.h  \
-       gtkanimationdescription.h \
+       gtkaccelmapprivate.h    \
+       gtkactionhelper.h       \
+       gtkallocatedbitmaskprivate.h    \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
        gtkappchooseronline.h   \
        gtkbindingsprivate.h    \
+       gtkbitmaskprivate.h     \
+       gtkbitmaskprivateimpl.h \
+       gtkborderimageprivate.h \
+       gtkboxprivate.h         \
+       gtkbubblewindowprivate.h        \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
+       gtkcairoblurprivate.h   \
        gtkcellareaboxcontextprivate.h  \
+       gtkcolorswatchprivate.h \
+       gtkcoloreditorprivate.h \
+       gtkcolorplaneprivate.h  \
+       gtkcolorscaleprivate.h  \
+       gtkcolorchooserprivate.h        \
+       gtkcontainerprivate.h   \
+       gtkcssanimationprivate.h        \
+       gtkcssarrayvalueprivate.h       \
+       gtkcssbgsizevalueprivate.h      \
+       gtkcssbordervalueprivate.h      \
+       gtkcsscolorvalueprivate.h       \
+       gtkcsscomputedvaluesprivate.h \
+       gtkcsscornervalueprivate.h      \
+       gtkcsscustompropertyprivate.h \
+       gtkcsseasevalueprivate.h        \
+       gtkcssenginevalueprivate.h      \
+       gtkcssenumvalueprivate.h        \
+       gtkcssimagecrossfadeprivate.h   \
+       gtkcssimagegradientprivate.h    \
+       gtkcssimagelinearprivate.h      \
+       gtkcssimageprivate.h    \
+       gtkcssimagesurfaceprivate.h     \
+       gtkcssimageurlprivate.h \
+       gtkcssimagevalueprivate.h       \
+       gtkcssimagewin32private.h       \
+       gtkcssinheritvalueprivate.h     \
+       gtkcssinitialvalueprivate.h     \
+       gtkcsskeyframesprivate.h        \
+       gtkcsslookupprivate.h   \
+       gtkcssmatcherprivate.h  \
+       gtkcssnumbervalueprivate.h      \
+       gtkcssparserprivate.h   \
+       gtkcsspositionvalueprivate.h    \
        gtkcssproviderprivate.h \
+       gtkcssrepeatvalueprivate.h      \
+       gtkcssrgbavalueprivate.h        \
+       gtkcsssectionprivate.h  \
+       gtkcssselectorprivate.h \
+       gtkcssshadowsvalueprivate.h     \
+       gtkcssshadowvalueprivate.h      \
+       gtkcssshorthandpropertyprivate.h \
+       gtkcssstringvalueprivate.h      \
+       gtkcssstylefuncsprivate.h \
+       gtkcssstylepropertyprivate.h \
+       gtkcsstransitionprivate.h       \
+       gtkcsstypedvalueprivate.h       \
+       gtkcssvalueprivate.h    \
        gtkcustompaperunixdialog.h \
-       gtkdndcursors.h         \
        gtkentryprivate.h       \
        gtkfilechooserdefault.h \
        gtkfilechooserembed.h   \
@@ -396,22 +483,32 @@ gtk_private_h_sources =           \
        gtkfilechooserutils.h   \
        gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
+       gtkfontchooserprivate.h \
+       gtkfontchooserutils.h   \
+       gtkhslaprivate.h        \
        gtkiconcache.h          \
+       gtkiconhelperprivate.h  \
+       gtkiconviewprivate.h    \
        gtkimageprivate.h       \
+       gtkimmoduleprivate.h    \
        gtkimcontextsimpleseqs.h \
        gtkintl.h               \
        gtkkeyhash.h            \
-       gtkmainprivate.h        \
+       gtklockbuttonprivate.h  \
+       gtkmenubuttonprivate.h  \
        gtkmenuprivate.h        \
        gtkmenuitemprivate.h    \
        gtkmenushellprivate.h   \
        gtkmnemonichash.h       \
+       gtkmodelmenuitem.h      \
        gtkmodifierstyle.h      \
+       gtkmodulesprivate.h     \
        gtkmountoperationprivate.h \
        gtknumerableiconprivate.h \
        gtkorientableprivate.h  \
        gtkpango.h              \
        gtkpathbar.h            \
+       gtkpressandholdprivate.h \
        gtkprintoperation-private.h \
        gtkprintutils.h         \
        gtkprivate.h            \
@@ -420,37 +517,79 @@ gtk_private_h_sources =           \
        gtkrecentchooserdefault.h \
        gtkrecentchooserprivate.h \
        gtkrecentchooserutils.h \
+       gtkresources.h          \
+       gtkroundedboxprivate.h  \
        gtkscaleprivate.h       \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
        gtkselectionprivate.h   \
        gtksettingsprivate.h    \
        gtksizegroup-private.h  \
+       gtksizerequestcacheprivate.h    \
        gtksocketprivate.h      \
+       gtkstyleanimationprivate.h \
+       gtkstylecascadeprivate.h \
        gtkstylecontextprivate.h \
+       gtkstylepropertiesprivate.h \
+       gtkstylepropertyprivate.h \
+       gtkstyleproviderprivate.h \
        gtktextbtree.h          \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
+       gtktexthandleprivate.h  \
        gtktextiterprivate.h    \
        gtktextmarkprivate.h    \
        gtktextsegment.h        \
        gtktexttagprivate.h     \
        gtktexttypes.h          \
        gtktextutil.h           \
-       gtktimeline.h           \
+       gtkthemingbackgroundprivate.h \
+       gtkthemingengineprivate.h \
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwidgetprivate.h      \
+       gtkwin32themeprivate.h  \
        gtkwindowprivate.h      \
        gtktreemenu.h           \
+       $(gtk_private_type_h_sources) \
        $(gtk_clipboard_dnd_h_sources) \
        $(gtk_appchooser_impl_h_sources)
 
 # GTK+ C sources to build the library from
+deprecated_c_sources =                         \
+       deprecated/gtkcolorsel.c        \
+       deprecated/gtkcolorseldialog.c  \
+       deprecated/gtkfontsel.c         \
+       deprecated/gtkgradient.c        \
+       deprecated/gtkhandlebox.c       \
+       deprecated/gtkhbbox.c           \
+       deprecated/gtkhbox.c            \
+       deprecated/gtkhpaned.c          \
+       deprecated/gtkhscale.c          \
+       deprecated/gtkhscrollbar.c      \
+       deprecated/gtkhseparator.c      \
+       deprecated/gtkhsv.c             \
+       deprecated/gtkrc.c              \
+       deprecated/gtkstyle.c           \
+       deprecated/gtksymboliccolor.c   \
+       deprecated/gtktable.c           \
+       deprecated/gtktearoffmenuitem.c \
+       deprecated/gtkvbbox.c           \
+       deprecated/gtkvbox.c            \
+       deprecated/gtkvscale.c          \
+       deprecated/gtkvscrollbar.c      \
+       deprecated/gtkvseparator.c      \
+       deprecated/gtkvpaned.c
+
 gtk_base_c_sources =           \
-       gtk9slice.c             \
+       $(deprecated_c_sources) \
+       gactionmuxer.c          \
+       gactionobserver.c       \
+       gactionobservable.c     \
+       gtkactionable.c         \
        gtkquery.c              \
+       gtksearchentry.c        \
        gtksearchengine.c       \
        gtksearchenginesimple.c \
        fnmatch.c               \
@@ -460,10 +599,12 @@ gtk_base_c_sources =              \
        gtkaccelmap.c           \
        gtkaccessible.c         \
        gtkaction.c             \
+       gtkactionhelper.c       \
        gtkactiongroup.c        \
        gtkactivatable.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
+       gtkallocatedbitmask.c   \
        gtkappchooser.c         \
        gtkappchooserwidget.c   \
        gtkappchooserbutton.c   \
@@ -471,7 +612,7 @@ gtk_base_c_sources =                \
        gtkappchoosermodule.c   \
        gtkappchooseronline.c   \
        gtkapplication.c        \
-       gtkanimationdescription.c \
+       gtkapplicationwindow.c  \
        gtkarrow.c              \
        gtkaspectframe.c        \
        gtkassistant.c          \
@@ -479,11 +620,15 @@ gtk_base_c_sources =              \
        gtkbin.c                \
        gtkbindings.c           \
        gtkborder.c             \
+       gtkborderimage.c        \
        gtkbox.c                \
+       gtkbubblewindow.c       \
        gtkbuildable.c          \
        gtkbuilder.c            \
        gtkbuilderparser.c      \
+       gtkbuilder-menus.c      \
        gtkbutton.c             \
+       gtkcairoblur.c          \
        gtkcalendar.c           \
        gtkcellarea.c           \
        gtkcellareabox.c        \
@@ -504,12 +649,61 @@ gtk_base_c_sources =              \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
        gtkcolorbutton.c        \
-       gtkcolorsel.c           \
-       gtkcolorseldialog.c     \
+       gtkcolorchooser.c       \
+       gtkcolorchooserwidget.c \
+       gtkcolorchooserdialog.c \
+       gtkcoloreditor.c        \
+       gtkcolorplane.c         \
+       gtkcolorscale.c         \
+       gtkcolorswatch.c        \
+       gtkcolorutils.c         \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcssanimation.c       \
+       gtkcssarrayvalue.c      \
+       gtkcssbgsizevalue.c     \
+       gtkcssbordervalue.c     \
+       gtkcsscolorvalue.c      \
+       gtkcsscomputedvalues.c  \
+       gtkcsscornervalue.c     \
+       gtkcsscustomproperty.c  \
+       gtkcsseasevalue.c       \
+       gtkcssenumvalue.c       \
+       gtkcssenginevalue.c     \
+       gtkcssimage.c           \
+       gtkcssimagecrossfade.c  \
+       gtkcssimagegradient.c   \
+       gtkcssimagelinear.c     \
+       gtkcssimagesurface.c    \
+       gtkcssimageurl.c        \
+       gtkcssimagevalue.c      \
+       gtkcssimagewin32.c      \
+       gtkcssinheritvalue.c    \
+       gtkcssinitialvalue.c    \
+       gtkcsskeyframes.c       \
+       gtkcsslookup.c          \
+       gtkcssmatcher.c         \
+       gtkcssnumbervalue.c     \
+       gtkcssparser.c          \
+       gtkcsspositionvalue.c   \
        gtkcssprovider.c        \
+       gtkcssrepeatvalue.c     \
+       gtkcssrgbavalue.c       \
+       gtkcsssection.c         \
+       gtkcssselector.c        \
+       gtkcssstringvalue.c     \
+       gtkcssshadowsvalue.c    \
+       gtkcssshadowvalue.c     \
+       gtkcssshorthandproperty.c \
+       gtkcssshorthandpropertyimpl.c \
+       gtkcssstylefuncs.c      \
+       gtkcssstyleproperty.c   \
+       gtkcssstylepropertyimpl.c \
+       gtkcsstransition.c      \
+       gtkcsstypedvalue.c      \
+       gtkcssvalue.c           \
+       gtkcsstypes.c           \
        gtkdialog.c             \
        gtkdrawingarea.c        \
        gtkeditable.c           \
@@ -531,21 +725,17 @@ gtk_base_c_sources =              \
        gtkfilesystemmodel.c    \
        gtkfixed.c              \
        gtkfontbutton.c         \
-       gtkfontsel.c            \
+       gtkfontchooser.c        \
+       gtkfontchooserdialog.c  \
+       gtkfontchooserutils.c   \
+       gtkfontchooserwidget.c  \
        gtkframe.c              \
-       gtkgradient.c           \
        gtkgrid.c               \
-       gtkhandlebox.c          \
-       gtkhbbox.c              \
-       gtkhbox.c               \
-       gtkhpaned.c             \
-       gtkhscale.c             \
-       gtkhscrollbar.c         \
-       gtkhseparator.c         \
-       gtkhsv.c                \
+       gtkhsla.c               \
        gtkiconcache.c          \
        gtkiconcachevalidator.c \
        gtkiconfactory.c        \
+       gtkiconhelper.c         \
        gtkicontheme.c          \
        gtkiconview.c           \
        gtkimage.c              \
@@ -559,18 +749,23 @@ gtk_base_c_sources =              \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
+       gtklevelbar.c           \
        gtklinkbutton.c         \
        gtkliststore.c          \
+       gtklockbutton.c         \
        gtkmain.c               \
        gtkmarshalers.c         \
        gtkmenu.c               \
        gtkmenubar.c            \
+       gtkmenubutton.c         \
        gtkmenuitem.c           \
        gtkmenushell.c          \
        gtkmenutoolbutton.c     \
        gtkmessagedialog.c      \
        gtkmisc.c               \
        gtkmnemonichash.c       \
+       gtkmodelmenu.c          \
+       gtkmodelmenuitem.c      \
        gtkmodifierstyle.c      \
        gtkmodules.c            \
        gtkmountoperation.c     \
@@ -578,16 +773,20 @@ gtk_base_c_sources =              \
        gtknumerableicon.c      \
        gtkoffscreenwindow.c    \
        gtkorientable.c         \
+       gtkoverlay.c            \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpango.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
+       gtkpressandhold.c       \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
        gtkprintoperationpreview.c \
        gtkprintsettings.c      \
        gtkprintutils.c         \
+       gtkprivate.c            \
+       gtkprivatetypebuiltins.c \
        gtkprogressbar.c        \
        gtkradioaction.c        \
        gtkradiobutton.c        \
@@ -595,7 +794,6 @@ gtk_base_c_sources =                \
        gtkradiotoolbutton.c    \
        gtkrange.c              \
        gtkrbtree.c             \
-       gtkrc.c                 \
        gtkrecentaction.c       \
        gtkrecentchooserdefault.c \
        gtkrecentchooserdialog.c \
@@ -605,6 +803,8 @@ gtk_base_c_sources =                \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
+       gtkresources.c          \
+       gtkroundedbox.c         \
        gtkscale.c              \
        gtkscalebutton.c        \
        gtkscrollable.c         \
@@ -617,20 +817,21 @@ gtk_base_c_sources =              \
        gtksettings.c           \
        gtksizegroup.c          \
        gtksizerequest.c        \
+       gtksizerequestcache.c   \
        gtkshow.c               \
        gtkspinbutton.c         \
        gtkspinner.c            \
        gtkstatusbar.c          \
        gtkstatusicon.c         \
        gtkstock.c              \
+       gtkstyleanimation.c     \
+       gtkstylecascade.c       \
        gtkstylecontext.c       \
        gtkstyleproperties.c    \
+       gtkstyleproperty.c      \
        gtkstyleprovider.c      \
-       gtkstyle.c              \
+       gtkstyleproviderprivate.c       \
        gtkswitch.c             \
-       gtksymboliccolor.c      \
-       gtktable.c              \
-       gtktearoffmenuitem.c    \
        gtktestutils.c          \
        gtktextattributes.c     \
        gtktextbtree.c          \
@@ -639,6 +840,7 @@ gtk_base_c_sources =                \
        gtktextbufferserialize.c \
        gtktextchild.c          \
        gtktextdisplay.c        \
+       gtktexthandle.c         \
        gtktextiter.c           \
        gtktextlayout.c         \
        gtktextmark.c           \
@@ -648,8 +850,8 @@ gtk_base_c_sources =                \
        gtktexttypes.c          \
        gtktextutil.c           \
        gtktextview.c           \
+       gtkthemingbackground.c  \
        gtkthemingengine.c      \
-       gtktimeline.c           \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
@@ -673,23 +875,27 @@ gtk_base_c_sources =              \
        gtktreeviewcolumn.c     \
        gtktypebuiltins.c       \
        gtkuimanager.c          \
-       gtkvbbox.c              \
-       gtkvbox.c               \
        gtkvolumebutton.c       \
        gtkviewport.c           \
-       gtkvpaned.c             \
-       gtkvscale.c             \
-       gtkvscrollbar.c         \
-       gtkvseparator.c         \
        gtkwidget.c             \
        gtkwidgetpath.c         \
        gtkwindow.c             \
+       gtkwin32theme.c         \
        $(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)
 
+gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h
+
+$(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml
+       $(AM_V_GEN) gdbus-codegen \
+       --interface-prefix org.Gtk. \
+       --c-namespace _Gtk \
+       --generate-c-code gtkdbusgenerated \
+       $(srcdir)/gtkdbusinterfaces.xml
+
 gtk_os_unix_c_sources =                \
        gtkcustompaperunixdialog.c      \
        gtkpagesetupunixdialog.c        \
@@ -701,8 +907,8 @@ gtk_os_unix_c_sources =             \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
         gtkprintbackend.c              \
-       gtksearchenginebeagle.c         \
-       gtksearchenginetracker.c
+       gtksearchenginetracker.c        \
+       $(gtk_dbus_built_sources)
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
 gtk_private_h_sources += \
@@ -712,14 +918,16 @@ gtk_private_h_sources += \
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
        gtkprinteroptionwidget.h        \
-       gtksearchenginebeagle.h         \
        gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
+else
+gtk_c_sources += $(gtk_dbus_built_sources)
 endif
 
 gtk_os_win32_c_sources = \
        gtkprint-win32.c                \
-       gtkprintoperation-win32.c
+       gtkprintoperation-win32.c       \
+       gtkwin32.c
 gtk_all_c_sources += $(gtk_os_win32_c_sources)
 if OS_WIN32
 gtk_private_h_sources += gtkprint-win32.h
@@ -738,29 +946,49 @@ gtk_use_win32_c_sources =         \
        gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
-       gtkmountoperation-stub.c
+       gtkmountoperation-stub.c \
+       gtkmodelmenu-quartz.c \
+       gtkquartz.c
 gtk_use_stub_c_sources =       \
        gtkmountoperation-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 +=       \
+gtk_use_x11_private_h_sources =        \
        gtkxembed.h             \
        gtktrayicon.h           \
        xembed.h
+if USE_X11
 gtk_c_sources += $(gtk_use_x11_c_sources)
-else
-if USE_WIN32
-gtk_private_h_sources +=       \
+gtk_private_h_sources += $(gtk_use_x11_private_h_sources)
+endif
+
+gtk_use_win32_private_h_sources =      \
        gtkwin32embed.h         \
        gtkwin32embedwidget.h
+if USE_WIN32
 gtk_c_sources += $(gtk_use_win32_c_sources)
-else
+gtk_private_h_sources += $(gtk_use_win32_private_h_sources)
+endif
+
+gtk_use_quartz_private_h_sources =     \
+       gtksearchenginequartz.h \
+       gtkmodelmenu-quartz.h \
+       gtkquartz.h
 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
+libgtk_3_la_CFLAGS = "-xobjective-c"
+gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
+endif
+
+gtk_all_private_h_sources = \
+       $(deprecated_private_h_sources) \
+       $(gtk_private_h_sources) \
+       $(gtk_use_x11_private_h_sources) \
+       $(gtk_use_win32_private_h_sources) \
+       $(gtk_use_quartz_private_h_sources)
+
+if !USE_X11
+if !USE_WIN32
+if !USE_QUARTZ
 gtk_c_sources += $(gtk_use_stub_c_sources)
 endif
 endif
@@ -769,17 +997,21 @@ endif
 if USE_QUARTZ
 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"
+       gtkdnd-quartz.c
 else
+if USE_WAYLAND
+if !USE_X11
+# No wayland gtkdnd-wayland.c yet
 gtk_clipboard_dnd_c_sources =  \
-       gtkclipboard.c          \
+       gtkclipboard-wayland.c \
        gtkdnd.c
-gtk_clipboard_dnd_c_sources_CFLAGS =
+else
+gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+endif
+else
+gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+endif
 endif
-EXTRA_DIST += gtkquartz.h
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -793,19 +1025,26 @@ gtk_built_public_sources =                       \
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
+       gtkdbusgenerated.h                      \
+       gtkresources.h                          \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h
+       gtkbuiltincache.h                       \
+       gtkprivatetypebuiltins.h
 
 gtk_built_sources =                            \
+       gtkdbusgenerated.c                      \
+       gtkresources.c                          \
        gtktypebuiltins.c                       \
        gtktypefuncs.c                          \
        gtkmarshalers.c                         \
+       gtkprivatetypebuiltins.c                \
        ${gtk_built_private_headers}            \
        ${gtk_built_public_sources}
 
 stamp_files =                                  \
        stamp-gtkmarshalers.h                   \
        stamp-gtktypebuiltins.h                 \
+       stamp-gtkprivatetypebuiltins.h          \
        stamp-icons
 
 # non-header sources (headers should be specified in the above variables)
@@ -817,18 +1056,41 @@ gtk_extra_sources =                              \
        gen-paper-names.c                       \
        gtkstatusicon-quartz.c                  \
        gtk.symbols                             \
+       gtk-win32-base.css                      \
+       gtk-win32.css                           \
+       gtk-win32-xp.css                        \
+       gtk-win32-classic.css                   \
        gtkversion.h.in                         \
-       gtkmarshalers.list
+       gtkmarshalers.list                      \
+       fallback-c89.c
 
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) stock-icons/icon-theme.cache
+MAINTAINERCLEANFILES = \
+       $(gtk_built_sources)                    \
+       $(stamp_files)                          \
+       $(GENERATED_ICONS)                      \
+       stock-icons/icon-theme.cache
+
 EXTRA_HEADERS =
-EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
+EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
 EXTRA_DIST += $(STOCK_ICONS)
 
+
+pkgdatadir=$(datadir)/gtk-$(GTK_API_VERSION)
+pkgdata_DATA = gtkbuilder.rng
+
+EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng
+
+DND_CURSORS = \
+       cursor_dnd_ask.png                              \
+       cursor_dnd_copy.png                             \
+       cursor_dnd_link.png                             \
+       cursor_dnd_move.png                             \
+       cursor_dnd_none.png
+
 #
 # rules to generate built sources
 #
@@ -836,7 +1098,7 @@ EXTRA_DIST += $(STOCK_ICONS)
 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)
+BUILT_SOURCES = $(gtk_built_sources) stamp-icons
 
 # all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
@@ -846,33 +1108,55 @@ BUILT_SOURCES = $(gtk_built_sources)
 gtkmarshalers.h: stamp-gtkmarshalers.h
        @true
 stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header --valist-marshallers >> xgen-gmlh \
        && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
        && rm -f xgen-gmlh \
        && echo timestamp > $(@F)
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
        $(AM_V_GEN) (echo "#include \"gtkmarshalers.h\""; \
-        $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
+        $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body  --valist-marshallers) >> xgen-gmlc \
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
 
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
-stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
+stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
-               $(gtk_public_h_sources) ) >> xgen-gtbh \
+               $(gtk_public_h_sources) $(deprecated_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) gtktypebuiltins.c.template
+gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
-               $(gtk_public_h_sources) ) > xgen-gtbc \
+               $(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
 
-gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
+gtkresources.h: gtk.gresource.xml
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+               --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register
+gtkresources.c: gtk.gresource.xml gtk-default.css gtk-win32.css gtk-win32-xp.css gtk-win32-base.css gtk-win32-classic.css $(DND_CURSORS)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+               --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register
+
+gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
+       @true
+stamp-gtkprivatetypebuiltins.h: @REBUILD@ $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \
+               $(gtk_private_type_h_sources) ) > xgen-gptbh \
+       && (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \
+       && rm -f xgen-gptbh \
+       && echo timestamp > $(@F)
+gtkprivatetypebuiltins.c: @REBUILD@ $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \
+               $(gtk_private_type_h_sources) ) > xgen-gptbc \
+       && cp xgen-gptbc gtkprivatetypebuiltins.c  \
+       && rm -f xgen-gptbc
+
+
+gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
        $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
-         ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+         ${CPP} $(DEFS) $(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/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
@@ -885,6 +1169,9 @@ lib_LTLIBRARIES = libgtk-3.la
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
 
+deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedinclude_HEADERS= $(deprecated_h_sources)
+
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
@@ -893,10 +1180,9 @@ libgtk_3_la_LDFLAGS = $(libtool_opts)
 libgtk_3_la_LIBADD = $(libadd)
 libgtk_3_la_DEPENDENCIES = $(deps)
 
-#libgtk_win32_3_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
-
 if USE_WIN32
-libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_3_la_LDFLAGS += -Wl,-luuid
 libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
@@ -908,7 +1194,7 @@ endif
 
 if USE_QUARTZ
 install-mac-key-theme:
-       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
        $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
 uninstall-mac-key-theme:
        rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
@@ -917,10 +1203,10 @@ install-mac-key-theme:
 uninstall-mac-key-theme:
 endif
 
-dist-hook: ../build/win32/vs9/gtk.vcproj
+dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
 
 ../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+       for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) | tr '/' '\\'`; do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\gtk\'$$F'" />' \
                     ;; \
@@ -929,13 +1215,31 @@ dist-hook: ../build/win32/vs9/gtk.vcproj
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
        rm libgtk.sourcefiles
 
+../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
+       for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) | tr '/' '\\'`; do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
+       rm libgtk.vs10.sourcefiles
+
+../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
+       for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
+       rm libgtk.vs10.sourcefiles.filters
+
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
-       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
-       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
        $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
        $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
@@ -948,6 +1252,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
 distclean-local:
        if test $(srcdir) != .; then \
          rm -f $(MAINTAINERCLEANFILES); \
+         rm -rf stock-icons; \
        fi
 
 DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
@@ -961,27 +1266,32 @@ LDADDS =                                                         \
 
 if HAVE_INTROSPECTION
 introspection_files = \
-    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
+    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
     $(gtk_base_c_sources) \
     gtkprintoperation-unix.c \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
+if USE_X11
+introspection_files += \
+    gtksocket.c \
+    gtkplug.c
+endif
+
 Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
 Gtk_3_0_gir_SCANNERFLAGS =                     \
        --add-include-path=$(top_builddir)/gdk  \
        --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
+Gtk_3_0_gir_INCLUDES = Atk-1.0
 if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+Gtk_3_0_gir_INCLUDES += xlib-2.0
 endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
-Gtk_3_0_gir_INCLUDES = Atk-1.0
 Gtk_3_0_gir_CFLAGS = \
-               $(INCLUDES) \
-               -UGDK_DISABLE_DEPRECATED \
-               -UGTK_DISABLE_DEPRECATED \
+               $(AM_CPPFLAGS) \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.la
+Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
 Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
 INTROSPECTION_GIRS += Gtk-3.0.gir
@@ -998,12 +1308,10 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = \
-       gtk-query-immodules-3.0
+bin_PROGRAMS = gtk-query-immodules-3.0
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
-endif
 
 if OS_WIN32
 
@@ -1036,9 +1344,10 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST):
         echo '</assembly>' ) >$@
 
 endif
+endif
 
 gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_3_0_LDADD = $(LDADDS)
+gtk_query_immodules_3_0_LDADD = $(LDADDS) $(GMODULE_LIBS)
 gtk_query_immodules_3_0_SOURCES = queryimmodules.c
 
 if BUILD_ICON_CACHE
@@ -1046,6 +1355,12 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 endif
 
+if HAVE_GIO_UNIX
+bin_PROGRAMS += gtk-launch
+gtk_launch_LDADD = $(LDADDS)
+gtk_launch_SOURCES = gtk-launch.c
+endif
+
 .PHONY: files test test-debug
 
 files:
@@ -1287,7 +1602,6 @@ GENERATED_ICONS = \
        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                 \
@@ -1299,8 +1613,7 @@ GENERATED_ICONS = \
        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
+       stock-icons/24/user-desktop.png
 
 # need to copy the icons so that we can replace the generated ones with
 # symlinks, even in the readonly srcdir case
@@ -1346,12 +1659,20 @@ stamp-icons: $(STOCK_ICONS)
 if USE_EXTERNAL_ICON_CACHE
 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
 else
-gtk_update_icon_cache_program = ./gtk-update-icon-cache
+if CROSS_COMPILING
+gtk_update_icon_cache_program = ./native/native-update-icon-cache
+else
+gtk_update_icon_cache_program = ./gtk-update-icon-cache$(EXEEXT)
+endif
 endif
 
 gtkbuiltincache.h: @REBUILD@ stamp-icons
 if !USE_EXTERNAL_ICON_CACHE
-       $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+if CROSS_COMPILING
+       $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) -C native/
+else
+       $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+endif
 endif
        $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index               \
           --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
@@ -1359,6 +1680,7 @@ endif
 
 EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \
+       $(DND_CURSORS)          \
        $(GENERATED_ICONS)      \
        gtk.def                 \
        gtk-win32.rc            \
@@ -1369,7 +1691,9 @@ EXTRA_DIST +=                   \
        gtkprint-win32.h        \
        gtkprint-win32.c        \
        gtksearchenginequartz.h \
-       gtk.css.raleigh         \
+       gtk.gresource.xml       \
+       gtkdbusinterfaces.xml   \
+       gtk-default.css         \
        gtk-keys.css.default    \
        gtk-keys.css.emacs      \
        gtk-keys.css.mac        \
@@ -1378,10 +1702,14 @@ EXTRA_DIST +=                   \
        abicheck.sh             \
        gtktypebuiltins.c.template \
        gtktypebuiltins.h.template \
-       org.gtk.Settings.FileChooser.gschema.xml
+       gtkprivatetypebuiltins.c.template \
+       gtkprivatetypebuiltins.h.template \
+       org.gtk.Settings.FileChooser.gschema.xml \
+       org.gtk.Settings.ColorChooser.gschema.xml
 
 gsettings_SCHEMAS = \
-       org.gtk.Settings.FileChooser.gschema.xml
+       org.gtk.Settings.FileChooser.gschema.xml \
+       org.gtk.Settings.ColorChooser.gschema.xml
 
 @GSETTINGS_RULES@