GtkLabelAccessible: Sanity check _get_text() input values

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f0659f1285107f096c181fbfc6e5151344e6e9ce..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
@@ -176,6 +176,7 @@ deprecated_private_h_sources =                      \
 gtk_public_h_sources =                 \
        gtk.h                   \
        gtkx.h                  \
+       gtk-a11y.h              \
        gtkaboutdialog.h        \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
@@ -421,6 +422,7 @@ gtk_private_h_sources =             \
        gtkbitmaskprivateimpl.h \
        gtkborderimageprivate.h \
        gtkboxprivate.h         \
+       gtkbubblewindowprivate.h        \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcairoblurprivate.h   \
@@ -446,6 +448,7 @@ gtk_private_h_sources =             \
        gtkcssimagegradientprivate.h    \
        gtkcssimagelinearprivate.h      \
        gtkcssimageprivate.h    \
+       gtkcssimagesurfaceprivate.h     \
        gtkcssimageurlprivate.h \
        gtkcssimagevalueprivate.h       \
        gtkcssimagewin32private.h       \
@@ -619,6 +622,7 @@ gtk_base_c_sources =                \
        gtkborder.c             \
        gtkborderimage.c        \
        gtkbox.c                \
+       gtkbubblewindow.c       \
        gtkbuildable.c          \
        gtkbuilder.c            \
        gtkbuilderparser.c      \
@@ -671,6 +675,7 @@ gtk_base_c_sources =                \
        gtkcssimagecrossfade.c  \
        gtkcssimagegradient.c   \
        gtkcssimagelinear.c     \
+       gtkcssimagesurface.c    \
        gtkcssimageurl.c        \
        gtkcssimagevalue.c      \
        gtkcssimagewin32.c      \
@@ -1303,9 +1308,7 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = \
-       gtk-query-immodules-3.0 \
-       gtk-launch
+bin_PROGRAMS = gtk-query-immodules-3.0
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
@@ -1352,8 +1355,11 @@ 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
 
@@ -1653,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 &&        \