Make gail parallel-installable too

Move libgail-util to libgail-util-3.0, and gail.pc to gail-3.0.pc

diff --git a/configure.ac b/configure.ac
index 48e31dd740406df2bfca50239ae05e3f39af3a0c..9a61092adae06d795c86985cebcb9edbbd9cd09e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2112,11 +2112,11 @@ gdk-pixbuf-3.0.pc
 gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
-gail.pc
+gail-3.0.pc
 gdk-pixbuf-3.0-uninstalled.pc
 gdk-3.0-uninstalled.pc
 gtk+-3.0-uninstalled.pc
-gail-uninstalled.pc
+gail-3.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in

diff --git a/gail-uninstalled.pc.in b/gail-3.0-uninstalled.pc.in
similarity index 94%
rename from gail-uninstalled.pc.in
rename to gail-3.0-uninstalled.pc.in
index 21f8ebd7d705b50b35355cc95223c983a3d780a4..50a802e90dcc4ee0b06c4df3682003b0f8181bec 100644 (file)
--- a/gail-uninstalled.pc.in
+++ b/gail-3.0-uninstalled.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Gail
 Description: GNOME Accessibility Implementation Library
 Version: @VERSION@
-Requires: atk gtk+-2.0 
+Requires: atk gtk+-3. 
 Libs: ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail.la ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail-util/libgailutil.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/modules/other/gail

diff --git a/gail.pc.in b/gail-3.0.pc.in
similarity index 65%
rename from gail.pc.in
rename to gail-3.0.pc.in
index bab729a897a8168cd5fae61d05b277770f653407..5b42e83e1115f2745a0f0f9911ae70d263c0bc1f 100644 (file)
--- a/gail.pc.in
+++ b/gail-3.0.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Gail
 Description: GNOME Accessibility Implementation Library
 Version: @VERSION@
-Requires: atk gtk+-2.0
-Libs: -L${libdir} -lgailutil
-Cflags: -I${includedir}/gail-1.0
+Requires: atk gtk+-3.0
+Libs: -L${libdir} -lgailutil-3.0
+Cflags: -I${includedir}/gail-3.0

diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 3e9a788f2014cea12d72dfdf891de64cc4c58dbf..533207f131ad46b6275f3cff0ec70474f140aafd 100644 (file)
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -62,7 +62,7 @@ gail_c_sources =                      \
        gailwidget.c                    \
        gailwindow.c
 
-libgailincludedir=$(includedir)/gail-1.0/gail
+libgailincludedir=$(includedir)/gail-3.0/gail
 
 gail_private_h_sources =               \
        gail.h                          \
@@ -148,7 +148,7 @@ libgail_la_LIBADD =  \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(top_builddir)/gtk/$(gtktargetlib)                             \
-       $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la  \
+       $(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la      \
        $(GTK_DEP_LIBS)                                                 \
        $(INTLLIBS)
 

diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
index 3145719b56e0d5e7b73389a3e9135ae29428a4b9..37e3b2de96bffc6d9b769be89eedd035743ce875 100644 (file)
--- a/modules/other/gail/libgail-util/Makefile.am
+++ b/modules/other/gail/libgail-util/Makefile.am
@@ -29,26 +29,26 @@ uninstall-ms-lib:
 endif
 
 
-lib_LTLIBRARIES = libgailutil.la
+lib_LTLIBRARIES = libgailutil-3.0.la
 
 util_c_sources =               \
        gailmisc.c              \
        gailtextutil.c
 
-libgailutilincludedir=$(includedir)/gail-1.0/libgail-util
+libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
 
 util_public_h_sources =                \
        gailmisc.h              \
        gailtextutil.h          \
        gail-util.h
 
-libgailutil_la_SOURCES =       \
+libgailutil_3_0_la_SOURCES =   \
        $(util_c_sources)
 
 libgailutilinclude_HEADERS =   \
        $(util_public_h_sources)
 
-libgailutil_la_CPPFLAGS = \
+libgailutil_3_0_la_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
@@ -58,24 +58,24 @@ libgailutil_la_CPPFLAGS = \
        -DGDK_DISABLE_DEPRECATED\
        -DGTK_DISABLE_DEPRECATED
 
-libgailutil_la_CFLAGS = \
+libgailutil_3_0_la_CFLAGS = \
        $(GTK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)      \
        $(AM_CFLAGS)
 
-libgailutil_la_LIBADD = \
+libgailutil_3_0_la_LIBADD = \
        $(top_builddir)/gtk/$(gtktargetlib)     \
        $(top_builddir)/gdk/$(gdktargetlib)     \
        $(GTK_DEP_LIBS)
 
-libgailutil_la_LDFLAGS = \
+libgailutil_3_0_la_LDFLAGS = \
        -version-info $(GAIL_LT_VERSION_INFO)   \
        $(no_undefined)                         \
        $(export_symbols)                       \
         $(LDFLAGS)
 
-gailutil.lib: libgailutil.la gailutil.def
-       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
+gailutil.lib: libgailutil-3.0.la gailutil.def
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
 install-data-local: install-ms-lib install-def-file
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4069c079cb69f5e843ca14dd9f8556a8c5f27820..526c1f6e1b8b97f7bcf78b27c04bde2b7591870f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -154,7 +154,7 @@ testsocket_DEPENDENCIES = $(DEPS)
 testsocket_child_DEPENDENCIES = $(DEPS)
 testspinbutton_DEPENDENCIES = $(TEST_DEPS)
 teststatusicon_DEPENDENCIES = $(TEST_DEPS)
-testtext_DEPENDENCIES = $(TEST_DEPS)
+#testtext_DEPENDENCIES = $(TEST_DEPS)
 testtreeedit_DEPENDENCIES = $(DEPS)
 testtreemodel_DEPENDENCIES = $(DEPS)
 testtreeview_DEPENDENCIES = $(DEPS)
@@ -228,7 +228,7 @@ testtreeflow_LDADD = $(LDADDS)
 testtreecolumns_LDADD = $(LDADDS)
 testtreecolumnsizing_LDADD = $(LDADDS)
 testtreesort_LDADD = $(LDADDS)
-testtext_LDADD = $(LDADDS)
+#testtext_LDADD = $(LDADDS)
 treestoretest_LDADD = $(LDADDS)
 testxinerama_LDADD = $(LDADDS)
 pixbuf_read_LDADD = $(LDADDS)
@@ -274,9 +274,9 @@ testtreeview_SOURCES =      \
        prop-editor.c   \
        testtreeview.c
 
-testtext_SOURCES =     \
-       prop-editor.c   \
-       testtext.c
+#testtext_SOURCES =    \
+#      prop-editor.c   \
+#      testtext.c
 
 testtoolbar_SOURCES =  \
        testtoolbar.c   \