filechooserbutton: Duh, remove all the timeouts after tests

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index aa8145f745132a9a0d147caefb7f8f6ea33b7e41..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          \
@@ -330,7 +336,6 @@ gtk_public_h_sources =              \
        gtkstyleproperties.h    \
        gtkstyleprovider.h      \
        gtkswitch.h             \
-       gtksymboliccolor.h      \
        gtktestutils.h          \
        gtktextattributes.h     \
        gtktextbuffer.h         \
@@ -417,6 +422,7 @@ gtk_private_h_sources =             \
        gtkbitmaskprivateimpl.h \
        gtkborderimageprivate.h \
        gtkboxprivate.h         \
+       gtkbubblewindowprivate.h        \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcairoblurprivate.h   \
@@ -442,6 +448,7 @@ gtk_private_h_sources =             \
        gtkcssimagegradientprivate.h    \
        gtkcssimagelinearprivate.h      \
        gtkcssimageprivate.h    \
+       gtkcssimagesurfaceprivate.h     \
        gtkcssimageurlprivate.h \
        gtkcssimagevalueprivate.h       \
        gtkcssimagewin32private.h       \
@@ -478,7 +485,6 @@ gtk_private_h_sources =             \
        gtkfilesystemmodel.h    \
        gtkfontchooserprivate.h \
        gtkfontchooserutils.h   \
-       gtkgradientprivate.h    \
        gtkhslaprivate.h        \
        gtkiconcache.h          \
        gtkiconhelperprivate.h  \
@@ -527,7 +533,6 @@ gtk_private_h_sources =             \
        gtkstylepropertiesprivate.h \
        gtkstylepropertyprivate.h \
        gtkstyleproviderprivate.h \
-       gtksymboliccolorprivate.h \
        gtktextbtree.h          \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
@@ -556,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            \
@@ -566,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           \
@@ -615,6 +622,7 @@ gtk_base_c_sources =                \
        gtkborder.c             \
        gtkborderimage.c        \
        gtkbox.c                \
+       gtkbubblewindow.c       \
        gtkbuildable.c          \
        gtkbuilder.c            \
        gtkbuilderparser.c      \
@@ -667,6 +675,7 @@ gtk_base_c_sources =                \
        gtkcssimagecrossfade.c  \
        gtkcssimagegradient.c   \
        gtkcssimagelinear.c     \
+       gtkcssimagesurface.c    \
        gtkcssimageurl.c        \
        gtkcssimagevalue.c      \
        gtkcssimagewin32.c      \
@@ -721,7 +730,6 @@ gtk_base_c_sources =                \
        gtkfontchooserutils.c   \
        gtkfontchooserwidget.c  \
        gtkframe.c              \
-       gtkgradient.c           \
        gtkgrid.c               \
        gtkhsla.c               \
        gtkiconcache.c          \
@@ -824,7 +832,6 @@ gtk_base_c_sources =                \
        gtkstyleprovider.c      \
        gtkstyleproviderprivate.c       \
        gtkswitch.c             \
-       gtksymboliccolor.c      \
        gtktestutils.c          \
        gtktextattributes.c     \
        gtktextbtree.c          \
@@ -973,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) \
@@ -1300,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
@@ -1349,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
 
@@ -1650,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 &&        \