gtk: Include gail by default, don't build it as a module

It is now no longer possible to disable it.
This doesn't matter though because GTK will not instantiate a11y
objects until you actually use it. So nothing changes in practice.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e1eeca304d305f46fb2841daf6fb6318a964e6c9..7c80c2f49cc9ffc8b8556af80d2cc6244b74cc32 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 . tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -109,6 +109,7 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
        $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/a11y/libgail.la \
        $(GTK_DEP_LIBS)
 deps =
 

diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 0e1474eb794cc3ab3bab818d7f3080f30b42dfd5..82d2daf36d9c18c915bb99999c904edab9fd7c93 100644 (file)
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -1,11 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-moduledir = $(libdir)/gtk-3.0/modules
-module_LTLIBRARIES = libgail.la
+noinst_LTLIBRARIES = libgail.la
 
 gail_c_sources =                       \
        gail-private-macros.h           \
@@ -144,13 +139,10 @@ libgail_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libgail_la_LIBADD =  \
-       $(top_builddir)/gtk/libgtk-3.la                         \
        $(GTK_DEP_LIBS)                                         \
        $(INTLLIBS)
 
 libgail_la_LDFLAGS =    \
-       -rpath $(moduledir) -module -avoid-version \
-       $(no_undefined) \
         $(LDFLAGS)
 
 -include $(top_srcdir)/git.mk

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d941bb835c177a5912ffab1dd3c5c1dc71ae2fde..55d806baafa75b964c41d25461e47d763baad90c 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -811,6 +811,9 @@ gettext_initialization (void)
 #endif  
 }
 
+/* XXX: Remove me after getting rid of gail */
+extern void gnome_accessibility_module_init     (void);
+
 static void
 do_post_parse_initialization (int    *argc,
                               char ***argv)
@@ -868,6 +871,8 @@ do_post_parse_initialization (int    *argc,
     {
       _gtk_modules_init (argc, argv, NULL);
     }
+
+  gnome_accessibility_module_init ();
 }