From: Owen Taylor Date: Tue, 5 Mar 2002 17:27:44 +0000 (+0000) Subject: Require GLib-2.0.0. X-Git-Tag: ATK_1_0_0_RC1~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3b1655142c41c1ecd0417b154c99a3c35ec338a;p=platform%2Fupstream%2Fatk.git Require GLib-2.0.0. Tue Mar 5 11:55:35 2002 Owen Taylor * configure.in: Require GLib-2.0.0. * configure.in atk/Makefile.am tests/Makefile.am atk.pc.in: Switch over to the Glib/GTK+ versioning scheme. --- diff --git a/ChangeLog b/ChangeLog index 1e2c33c..fd20d46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 5 11:55:35 2002 Owen Taylor + + * configure.in: Require GLib-2.0.0. + + * configure.in atk/Makefile.am tests/Makefile.am atk.pc.in: + Switch over to the Glib/GTK+ versioning scheme. + 2002-03-05 Padraig O'Briain * atk/atktext.c (atk_text_get_text): diff --git a/atk.pc.in b/atk.pc.in index e2532e7..39aa30e 100644 --- a/atk.pc.in +++ b/atk.pc.in @@ -7,5 +7,5 @@ Name: Atk Description: Accessibility Toolkit Version: @VERSION@ Requires: @GLIB_PACKAGES@ -Libs: -L${libdir} -latk +Libs: -L${libdir} -latk-@ATK_API_VERSION@ Cflags: -I${includedir}/atk-1.0 diff --git a/atk/Makefile.am b/atk/Makefile.am index 988f8b9..f46e43d 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -16,7 +16,7 @@ install-libtool-import-lib: uninstall-libtool-import-lib: endif -lib_LTLIBRARIES = libatk.la +lib_LTLIBRARIES = libatk-1.0.la if MS_LIB_AVAILABLE noinst_DATA = atk.lib @@ -36,7 +36,7 @@ atk_built_cfiles = atk-enum-types.c $(OBJECTS): $(atk_built_headers) -libatk_la_SOURCES = \ +libatk_1_0_la_SOURCES = \ atkaction.c \ atkcomponent.c \ atkdocument.c \ @@ -74,10 +74,10 @@ INCLUDES = \ -DG_DISABLE_DEPRECATED \ @DEP_CFLAGS@ -LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - $(export_symbols) \ - $(no_undefined) \ +LDFLAGS = \ + -version-info $(LT_VERSION_INFO) \ + $(export_symbols) \ + $(no_undefined) \ @DEP_LIBS@ libatkincludedir=$(includedir)/atk-1.0/atk @@ -112,7 +112,7 @@ libatkinclude_HEADERS = \ $(atk_headers) \ $(atk_built_headers) -$(libatk_la_OBJECTS): atkmarshal.c atkmarshal.h $(atk_built_headers) +$(libatk_1_0_la_OBJECTS): atkmarshal.c atkmarshal.h $(atk_built_headers) atkmarshal.h: @REBUILD@ stamp-atkmarshal.h @true @@ -168,7 +168,7 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile && echo timestamp > $(@F) -atk.lib: libatk.la atk.def +atk.lib: libatk-$(ATK_API_VERSION).la atk.def lib -name:libatk-@LT_CURRENT_MINUS_AGE@.dll -def:atk.def -out:$@ install-data-local: install-ms-lib install-libtool-import-lib diff --git a/configure.in b/configure.in index f18fa89..884d26a 100644 --- a/configure.in +++ b/configure.in @@ -9,48 +9,60 @@ dnl it too, or it will never make it into the spec file! dnl dnl ========================================================================== -GLIB_REQUIRED_VERSION=1.3.12 +GLIB_REQUIRED_VERSION=2.0.0 AC_SUBST(GLIB_REQUIRED_VERSION) dnl ========================================================================== +dnl Versioning +dnl ========================================================================== + +dnl Making releases: +dnl ATK_MICRO_VERSION += 1; +dnl ATK_INTERFACE_AGE += 1; +dnl ATK_BINARY_AGE += 1; +dnl if any functions have been added, set ATK_INTERFACE_AGE to 0. +dnl if backwards compatibility has been broken, +dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0. -# -# Making releases: -# ATK_MICRO_VERSION += 1; -# ATK_INTERFACE_AGE += 1; -# ATK_BINARY_AGE += 1; -# if any functions have been added, set ATK_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set ATK_BINARY_AGE and ATK_INTERFACE_AGE to 0. -# - -ATK_MAJOR_VERSION=0 +dnl The triplet +ATK_MAJOR_VERSION=1 ATK_MINOR_VERSION=0 -ATK_MICRO_VERSION=13 +ATK_MICRO_VERSION=0 +ATK_VERSION=$ATK_MAJOR_VERSION.$ATK_MINOR_VERSION.$ATK_MICRO_VERSION + +dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2. +ATK_API_VERSION=1.0 + +dnl Number of releases since we've added interfaces ATK_INTERFACE_AGE=0 -ATK_BINARY_AGE=0 -## with 1.0 you'd insert MINOR_VERSION in here, i.e. 0.3->1.0.0->1.0.1->1.0.2 -## note that micro version has to go in the libtool stuff below -ATK_VERSION=$ATK_MAJOR_VERSION.$ATK_MICRO_VERSION -AM_INIT_AUTOMAKE(atk, $ATK_VERSION) + +dnl Number of releases since we've broken binary compatibility. Should equal +dnl ATK_MICRO_VERSION for a stable release +# ATK_BINARY_AGE=0 +ATK_BINARY_AGE=$ATK_MICRO_VERSION AC_SUBST(ATK_MAJOR_VERSION) AC_SUBST(ATK_MINOR_VERSION) -AC_SUBST(ATK_MICRO_VERSION) AC_SUBST(ATK_VERSION) +AC_SUBST(ATK_API_VERSION) +AC_SUBST(ATK_MICRO_VERSION) +AC_SUBST(ATK_INTERFACE_AGE) +AC_SUBST(ATK_BINARY_AGE) + +dnl libtool versioning +lt_current=`expr $ATK_MICRO_VERSION - $ATK_INTERFACE_AGE` +lt_revision=$ATK_INTERFACE_AGE +lt_age=`expr $ATK_BINARY_AGE - $ATK_INTERFACE_AGE` +LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" +LT_CURRENT_MINUS_AGE=`expr $lt_current - $lt_age` -# libtool versioning -LT_RELEASE=$ATK_MAJOR_VERSION.$ATK_MINOR_VERSION -LT_CURRENT=`expr $ATK_MICRO_VERSION - $ATK_INTERFACE_AGE` -LT_REVISION=$ATK_INTERFACE_AGE -LT_AGE=`expr $ATK_BINARY_AGE - $ATK_INTERFACE_AGE` -LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` -AC_SUBST(LT_RELEASE) -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) +AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_CURRENT_MINUS_AGE) +dnl ========================================================================== + +AM_INIT_AUTOMAKE(atk,$ATK_VERSION) + AC_PROG_CC AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL diff --git a/docs/tmpl/atkdocument.sgml b/docs/tmpl/atkdocument.sgml index 5972540..4a7bb0e 100644 --- a/docs/tmpl/atkdocument.sgml +++ b/docs/tmpl/atkdocument.sgml @@ -28,6 +28,14 @@ AtkDocument @parent: @get_document_type: @get_document: +@pad1: +@pad2: +@pad3: +@pad4: +@pad5: +@pad6: +@pad7: +@pad8: diff --git a/docs/tmpl/atkhypertext.sgml b/docs/tmpl/atkhypertext.sgml index f96dbbf..ff6a5fe 100644 --- a/docs/tmpl/atkhypertext.sgml +++ b/docs/tmpl/atkhypertext.sgml @@ -29,6 +29,10 @@ AtkHypertext @get_link: @get_n_links: @get_link_index: +@pad1: +@pad2: +@pad3: +@pad4: diff --git a/tests/Makefile.am b/tests/Makefile.am index 9fc9faf..cb96b4b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = \ libteststateset.la \ libtestrelation.la -libatk = $(top_builddir)/atk/libatk.la +libatk = $(top_builddir)/atk/libatk-$(ATK_API_VERSION).la INCLUDES = -I$(top_srcdir) \ -DG_DISABLE_DEPRECATED \