filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 07316ba34f5ff830d3f7c666f6be0c5b3b6bbdb3..e164c90c95dc09f686dbeb0045bdcc80730f9391 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = a11y . tests
+SUBDIRS = a11y native . tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -107,12 +107,12 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
        $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/a11y/libgail.la \
+       $(top_builddir)/gtk/a11y/libgtka11y.la \
        $(GMODULE_LIBS) \
        $(GTK_DEP_LIBS)
 deps = \
        $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/a11y/libgail.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
@@ -148,6 +148,7 @@ deprecated_h_sources =                      \
        deprecated/gtkcolorsel.h        \
        deprecated/gtkcolorseldialog.h  \
        deprecated/gtkfontsel.h         \
+       deprecated/gtkgradient.h        \
        deprecated/gtkhandlebox.h       \
        deprecated/gtkhbbox.h           \
        deprecated/gtkhbox.h            \
@@ -156,8 +157,9 @@ deprecated_h_sources =                      \
        deprecated/gtkhscrollbar.h      \
        deprecated/gtkhseparator.h      \
        deprecated/gtkhsv.h             \
-       deprecated/gtkstyle.h           \
        deprecated/gtkrc.h              \
+       deprecated/gtkstyle.h           \
+       deprecated/gtksymboliccolor.h   \
        deprecated/gtktable.h           \
        deprecated/gtktearoffmenuitem.h \
        deprecated/gtkvbbox.h           \
@@ -167,9 +169,14 @@ deprecated_h_sources =                     \
        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         \
@@ -249,7 +256,6 @@ gtk_public_h_sources =              \
        gtkfontchooserdialog.h  \
        gtkfontchooserwidget.h  \
        gtkframe.h              \
-       gtkgradient.h           \
        gtkgrid.h               \
        gtkiconfactory.h        \
        gtkicontheme.h          \
@@ -265,6 +271,7 @@ gtk_public_h_sources =              \
        gtkinvisible.h          \
        gtklabel.h              \
        gtklayout.h             \
+       gtklevelbar.h           \
        gtklinkbutton.h         \
        gtkliststore.h          \
        gtklockbutton.h         \
@@ -329,7 +336,6 @@ gtk_public_h_sources =              \
        gtkstyleproperties.h    \
        gtkstyleprovider.h      \
        gtkswitch.h             \
-       gtksymboliccolor.h      \
        gtktestutils.h          \
        gtktextattributes.h     \
        gtktextbuffer.h         \
@@ -393,19 +399,20 @@ gtk_appchooser_impl_c_sources = \
        gtkappchooseronlinepk.c
 endif
 
-gtk_private_type_h_sources = \
-       gtkcsstypesprivate.h
+gtk_private_type_h_sources =   \
+       gtkcsstypesprivate.h    \
+       gtktexthandleprivate.h
 
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
        gactionmuxer.h          \
-       gsimpleactionobserver.h \
        gactionobserver.h       \
        gactionobservable.h     \
        gtkapplicationprivate.h \
        gtkaccelgroupprivate.h  \
        gtkaccelmapprivate.h    \
+       gtkactionhelper.h       \
        gtkallocatedbitmaskprivate.h    \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
@@ -415,8 +422,10 @@ gtk_private_h_sources =            \
        gtkbitmaskprivateimpl.h \
        gtkborderimageprivate.h \
        gtkboxprivate.h         \
+       gtkbubblewindowprivate.h        \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
+       gtkcairoblurprivate.h   \
        gtkcellareaboxcontextprivate.h  \
        gtkcolorswatchprivate.h \
        gtkcoloreditorprivate.h \
@@ -424,10 +433,11 @@ gtk_private_h_sources =           \
        gtkcolorscaleprivate.h  \
        gtkcolorchooserprivate.h        \
        gtkcontainerprivate.h   \
-       gtkcssanimatedvaluesprivate.h   \
+       gtkcssanimationprivate.h        \
        gtkcssarrayvalueprivate.h       \
        gtkcssbgsizevalueprivate.h      \
        gtkcssbordervalueprivate.h      \
+       gtkcsscolorvalueprivate.h       \
        gtkcsscomputedvaluesprivate.h \
        gtkcsscornervalueprivate.h      \
        gtkcsscustompropertyprivate.h \
@@ -438,11 +448,13 @@ gtk_private_h_sources =           \
        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      \
@@ -473,6 +485,7 @@ gtk_private_h_sources =             \
        gtkfilesystemmodel.h    \
        gtkfontchooserprivate.h \
        gtkfontchooserutils.h   \
+       gtkhslaprivate.h        \
        gtkiconcache.h          \
        gtkiconhelperprivate.h  \
        gtkiconviewprivate.h    \
@@ -481,12 +494,12 @@ gtk_private_h_sources =           \
        gtkimcontextsimpleseqs.h \
        gtkintl.h               \
        gtkkeyhash.h            \
+       gtklockbuttonprivate.h  \
        gtkmenubuttonprivate.h  \
        gtkmenuprivate.h        \
        gtkmenuitemprivate.h    \
        gtkmenushellprivate.h   \
        gtkmnemonichash.h       \
-       gtkmodelmenu.h          \
        gtkmodelmenuitem.h      \
        gtkmodifierstyle.h      \
        gtkmodulesprivate.h     \
@@ -512,6 +525,7 @@ gtk_private_h_sources =             \
        gtkselectionprivate.h   \
        gtksettingsprivate.h    \
        gtksizegroup-private.h  \
+       gtksizerequestcacheprivate.h    \
        gtksocketprivate.h      \
        gtkstyleanimationprivate.h \
        gtkstylecascadeprivate.h \
@@ -519,10 +533,10 @@ gtk_private_h_sources =           \
        gtkstylepropertiesprivate.h \
        gtkstylepropertyprivate.h \
        gtkstyleproviderprivate.h \
-       gtksymboliccolorprivate.h \
        gtktextbtree.h          \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
+       gtktexthandleprivate.h  \
        gtktextiterprivate.h    \
        gtktextmarkprivate.h    \
        gtktextsegment.h        \
@@ -547,6 +561,7 @@ deprecated_c_sources =                      \
        deprecated/gtkcolorsel.c        \
        deprecated/gtkcolorseldialog.c  \
        deprecated/gtkfontsel.c         \
+       deprecated/gtkgradient.c        \
        deprecated/gtkhandlebox.c       \
        deprecated/gtkhbbox.c           \
        deprecated/gtkhbox.c            \
@@ -557,6 +572,7 @@ deprecated_c_sources =                      \
        deprecated/gtkhsv.c             \
        deprecated/gtkrc.c              \
        deprecated/gtkstyle.c           \
+       deprecated/gtksymboliccolor.c   \
        deprecated/gtktable.c           \
        deprecated/gtktearoffmenuitem.c \
        deprecated/gtkvbbox.c           \
@@ -569,7 +585,6 @@ deprecated_c_sources =                      \
 gtk_base_c_sources =           \
        $(deprecated_c_sources) \
        gactionmuxer.c          \
-       gsimpleactionobserver.c \
        gactionobserver.c       \
        gactionobservable.c     \
        gtkactionable.c         \
@@ -584,6 +599,7 @@ gtk_base_c_sources =                \
        gtkaccelmap.c           \
        gtkaccessible.c         \
        gtkaction.c             \
+       gtkactionhelper.c       \
        gtkactiongroup.c        \
        gtkactivatable.c        \
        gtkadjustment.c         \
@@ -606,11 +622,13 @@ gtk_base_c_sources =              \
        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        \
@@ -642,10 +660,11 @@ gtk_base_c_sources =              \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
-       gtkcssanimatedvalues.c  \
+       gtkcssanimation.c       \
        gtkcssarrayvalue.c      \
        gtkcssbgsizevalue.c     \
        gtkcssbordervalue.c     \
+       gtkcsscolorvalue.c      \
        gtkcsscomputedvalues.c  \
        gtkcsscornervalue.c     \
        gtkcsscustomproperty.c  \
@@ -656,11 +675,13 @@ gtk_base_c_sources =              \
        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     \
@@ -709,8 +730,8 @@ gtk_base_c_sources =                \
        gtkfontchooserutils.c   \
        gtkfontchooserwidget.c  \
        gtkframe.c              \
-       gtkgradient.c           \
        gtkgrid.c               \
+       gtkhsla.c               \
        gtkiconcache.c          \
        gtkiconcachevalidator.c \
        gtkiconfactory.c        \
@@ -728,6 +749,7 @@ gtk_base_c_sources =                \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
+       gtklevelbar.c           \
        gtklinkbutton.c         \
        gtkliststore.c          \
        gtklockbutton.c         \
@@ -795,6 +817,7 @@ gtk_base_c_sources =                \
        gtksettings.c           \
        gtksizegroup.c          \
        gtksizerequest.c        \
+       gtksizerequestcache.c   \
        gtkshow.c               \
        gtkspinbutton.c         \
        gtkspinner.c            \
@@ -809,7 +832,6 @@ gtk_base_c_sources =                \
        gtkstyleprovider.c      \
        gtkstyleproviderprivate.c       \
        gtkswitch.c             \
-       gtksymboliccolor.c      \
        gtktestutils.c          \
        gtktextattributes.c     \
        gtktextbtree.c          \
@@ -818,6 +840,7 @@ gtk_base_c_sources =                \
        gtktextbufferserialize.c \
        gtktextchild.c          \
        gtktextdisplay.c        \
+       gtktexthandle.c         \
        gtktextiter.c           \
        gtktextlayout.c         \
        gtktextmark.c           \
@@ -864,6 +887,15 @@ gtk_base_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        \
@@ -875,7 +907,8 @@ gtk_os_unix_c_sources =             \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
         gtkprintbackend.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 += \
@@ -887,6 +920,8 @@ gtk_private_h_sources += \
        gtkprinteroptionwidget.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 = \
@@ -945,6 +980,7 @@ 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) \
@@ -989,12 +1025,14 @@ gtk_built_public_sources =                       \
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
+       gtkdbusgenerated.h                      \
        gtkresources.h                          \
        gtkmarshalers.h                         \
        gtkbuiltincache.h                       \
        gtkprivatetypebuiltins.h
 
 gtk_built_sources =                            \
+       gtkdbusgenerated.c                      \
        gtkresources.c                          \
        gtktypebuiltins.c                       \
        gtktypefuncs.c                          \
@@ -1168,7 +1206,7 @@ endif
 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 `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; 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'" />' \
                     ;; \
@@ -1178,7 +1216,7 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
        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) | tr '/' '\\'`; 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 '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
                     ;; \
@@ -1270,8 +1308,7 @@ 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
@@ -1318,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:
@@ -1616,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 &&        \
@@ -1641,6 +1692,7 @@ EXTRA_DIST +=                   \
        gtkprint-win32.c        \
        gtksearchenginequartz.h \
        gtk.gresource.xml       \
+       gtkdbusinterfaces.xml   \
        gtk-default.css         \
        gtk-keys.css.default    \
        gtk-keys.css.emacs      \