updatedGTK_ALL_1_3_6ATK_0_2

2001-06-11  Havoc Pennington  <hp@redhat.com>

	* NEWS: updated

	* configure.in: bump version to 0.2 and add infrastructure for
	libtool version info. Assumes GTK versioning scheme (major.minor
	is binary compatible)

	* atk/Makefile.am (LDFLAGS): set version info
	(stamp-atkmarshal.h): glib-genmarshal already includes top_builddir

5 files changed, 56 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index bc9107e..ed0abf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+	* NEWS: updated
+
+	* configure.in: bump version to 0.2 and add infrastructure for 
+	libtool version info. Assumes GTK versioning scheme (major.minor 
+	is binary compatible)
+	
+	* atk/Makefile.am (LDFLAGS): set version info
+	(stamp-atkmarshal.h): glib-genmarshal already includes top_builddir
+	
 2001-06-13  Brian Cameron <brian.cameron@sun.com>
 
 	* atk/atktable.h, atk/atktable.c
diff --git a/NEWS b/NEWS
index a3b1614..efebb3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,8 @@
+Changes in 0.2
+
+* Some API tweaks
+
+Changes in 0.1
+
 This is the initial release of ATK, the Accessibility Tookit, which will be
 used obtain accessibily information from GTK+ and GNOME widgets.
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 7a2b17c..52ad7bf 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -34,7 +34,8 @@ INCLUDES = \
 	@DEP_CFLAGS@
 
 LDFLAGS =  \
-	-no-undefined	\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+	-no-undefined						\
 	@DEP_LIBS@
 
 libatkincludedir=$(includedir)/atk-1.0/atk
@@ -67,7 +68,7 @@ atkmarshal.h: @REBUILD@ stamp-atkmarshal.h
 	@true
 stamp-atkmarshal.h: atkmarshal.list
 	case @GLIB_GENMARSHAL@ in									\
-	   .*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;				\
+	   .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;				\
 	   *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;							\
 	esac;												\
 	$$glib_genmarshal --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh		\
@@ -79,7 +80,7 @@ atkmarshal.c: @REBUILD@ stamp-atkmarshal.c
 	@true
 stamp-atkmarshal.c: atkmarshal.list
 	case @GLIB_GENMARSHAL@ in									\
-	   .*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;				\
+	   .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;				\
 	   *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;							\
 	esac;												\
 	$$glib_genmarshal --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc		\
diff --git a/configure.in b/configure.in
index 9fa0cd6..ff928d8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,41 @@
 dnl Process this file with autoconf to produce a configure script.
 
+AC_INIT(ChangeLog)
+AM_INIT_AUTOMAKE(atk, 0.2)
+
+#
+# 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
-ATK_MINOR_VERSION=1
+ATK_MINOR_VERSION=0
+ATK_MICRO_VERSION=2
+ATK_INTERFACE_AGE=0
+ATK_BINARY_AGE=0
+## post-1.0 you'd add MINOR_VERSION in here, i.e. 0.3->1.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
 
 AC_SUBST(ATK_MAJOR_VERSION)
 AC_SUBST(ATK_MINOR_VERSION)
-
-AC_INIT(ChangeLog)
-AM_INIT_AUTOMAKE(atk, 0.1)
+AC_SUBST(ATK_MICRO_VERSION)
+AC_SUBST(ATK_VERSION)
+
+# 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`
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
 
 AC_PROG_CC
 AM_DISABLE_STATIC
@@ -49,7 +77,7 @@ if $PKG_CONFIG --uninstalled $GLIB_PACKAGES $PANGO_PACKAGES; then
 else
         AC_CHECK_LIB(pango, pango_context_new, :, AC_MSG_ERROR([
                 *** Can't link to Pango. Pango is required to build
-                *** GTK+. For more information see http://www.pango.org]), $DEP_LIBS)
+                *** ATK. For more information see http://www.pango.org]), $DEP_LIBS)
 fi
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0c8a71a..03c447f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -55,7 +55,7 @@ all-local: html-build.stamp
 scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
- 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 		else \
 	cd $(srcdir) ; \
 	for i in $(SCANOBJ_FILES) ; do \
@@ -141,7 +141,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/html/index.sgml $(distdir)/html
+	cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
 
 	images=$(HTML_IMAGES) ;			\