Fix for bug 141875.

2004-05-11 James Henstridge <james@daa.com.au> * configure.in: use AM_GLIB_DEFINE_LOCALEDIR() to define the locale directory. Use AC_HELP_STRING to format help string for the --disable-rebuilds command. 2004-05-05 James Henstridge <james@daa.com.au> * libgnomecanvas/Makefile.am (CLEANFILES): remove gnome-canvas-marshal.[ch] on "make clean". * tests/Makefile.am (AM_LDFLAGS): change from LDFLAGS, as suggested by automake * docs/reference/Makefile.am: use gtk-doc.make so that boilerplate reference documentation build rules don't need to be maintained here. * Makefile.am: require automake-1.7. Enable docs building during distcheck. * configure.in: update configure script to match more recent style. * autogen.sh (REQUIRED_AUTOMAKE_VERSION): require Automake 1.7.
2004-05-11 11:35:25 +00:00 · 2004-05-11 11:35:25 +00:00 · 6124ca0b10
parent 658ea6f288
commit 6124ca0b10
8 changed files with 105 additions and 236 deletions
--- a/27
+++ b/27
@ -1,3 +1,30 @@
+2004-05-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: use AM_GLIB_DEFINE_LOCALEDIR() to define the
+	locale directory.
+	Use AC_HELP_STRING to format help string for the
+	--disable-rebuilds command.
+
+2004-05-05  James Henstridge  <james@daa.com.au>
+
+	* libgnomecanvas/Makefile.am (CLEANFILES): remove
+	gnome-canvas-marshal.[ch] on "make clean".
+
+	* tests/Makefile.am (AM_LDFLAGS): change from LDFLAGS, as
+	suggested by automake
+
+	* docs/reference/Makefile.am: use gtk-doc.make so that boilerplate
+	reference documentation build rules don't need to be maintained
+	here.
+
+	* Makefile.am: require automake-1.7.  Enable docs building during
+	distcheck.
+
+	* configure.in: update configure script to match more recent
+	style.
+
+	* autogen.sh (REQUIRED_AUTOMAKE_VERSION): require Automake 1.7.
+
 =================== 2.6.1.1 ===================

 2004-04-20  Anders Carlsson  <andersca@gnome.org>
--- a/Makefile.am
+++ b/Makefile.am
@ -1,3 +1,7 @@
+AUTOMAKE_OPTIONS = 1.7
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
 SUBDIRS = libgnomecanvas glade demos po tests docs

 EXTRA_DIST = COPYING.LIB NEWS
--- a/autogen.sh
+++ b/autogen.sh
@ -6,6 +6,9 @@ test -z "$srcdir" && srcdir=.

 PKG_NAME="libgnomecanvas"

+REQUIRED_AUTOMAKE_VERSION=1.7
+export REQUIRED_AUTOMAKE_VERSION
+
 (test -f $srcdir/configure.in \
  && test -f $srcdir/autogen.sh \
  && test -d $srcdir/libgnomecanvas) || {
--- a/configure.in
+++ b/configure.in
@ -1,4 +1,4 @@
-AC_INIT(libgnomecanvas)
+AC_PREREQ(2.54)

 # Making releases:
 #   LIBGNOMECANVAS_MICRO_VERSION += 1;
@ -7,28 +7,50 @@ AC_INIT(libgnomecanvas)
 # if backwards compatibility has been broken,
 # set LIBGNOMECANVAS_BINARY_AGE and LIBGNOMECANVAS_INTERFACE_AGE to 0.
 #
-LIBGNOMECANVAS_MAJOR_VERSION=2
-LIBGNOMECANVAS_MINOR_VERSION=6
-LIBGNOMECANVAS_MICRO_VERSION=1
-LIBGNOMECANVAS_INTERFACE_AGE=1
+m4_define([libgnomecanvas_major_version], [2])
+m4_define([libgnomecanvas_minor_version], [6])
+m4_define([libgnomecanvas_micro_version], [1])
+m4_define([libgnomecanvas_interface_age], [1])
 # If you need a modifier for the version number. 
 # Normally empty, but can be used to make "fixup" releases.
-LIBGNOMECANVAS_EXTRAVERSION=.1
+m4_define([libgnomecanvas_extraversion],  [.1])
+
+dnl required versions of other programs
+m4_define([gtk_required_version],      [2.0.3])
+m4_define([libart_required_version],   [2.3.8])
+m4_define([pango_required_version],    [1.0.1])
+m4_define([libglade_required_version], [2.0.0])
+

 dnl libtool versioning from libgnome

-LIBGNOMECANVAS_CURRENT=`expr 100 '*' $LIBGNOMECANVAS_MINOR_VERSION + $LIBGNOMECANVAS_MICRO_VERSION - $LIBGNOMECANVAS_INTERFACE_AGE`
-LIBGNOMECANVAS_BINARY_AGE=`expr 100 '*' $LIBGNOMECANVAS_MINOR_VERSION + $LIBGNOMECANVAS_MICRO_VERSION`
-LIBGNOMECANVAS_REVISION=$LIBGNOMECANVAS_INTERFACE_AGE
-LIBGNOMECANVAS_AGE=`expr $LIBGNOMECANVAS_BINARY_AGE - $LIBGNOMECANVAS_INTERFACE_AGE`
-LIBGNOMECANVAS_VERSION=$LIBGNOMECANVAS_MAJOR_VERSION.$LIBGNOMECANVAS_MINOR_VERSION.$LIBGNOMECANVAS_MICRO_VERSION$LIBGNOMECANVAS_EXTRAVERSION
+m4_define([libgnomecanvas_current], [m4_eval(100 * libgnomecanvas_minor_version + libgnomecanvas_micro_version - libgnomecanvas_interface_age)])
+m4_define([libgnomecanvas_binary_age], [m4_eval(100 * libgnomecanvas_minor_version + libgnomecanvas_micro_version)])
+m4_define([libgnomecanvas_revision], [libgnomecanvas_interface_age])
+m4_define([libgnomecanvas_age], [m4_eval(libgnomecanvas_binary_age - libgnomecanvas_interface_age)])
+m4_define([libgnomecanvas_version], [libgnomecanvas_major_version().libgnomecanvas_minor_version().libgnomecanvas_micro_version()libgnomecanvas_extraversion()])
+
+AC_INIT([libgnomecanvas], [libgnomecanvas_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomecanvas])
+AC_CONFIG_SRCDIR([libgnomecanvas/libgnomecanvas.h])
+
+LIBGNOMECANVAS_MAJOR_VERSION=libgnomecanvas_major_version
+LIBGNOMECANVAS_MINOR_VERSION=libgnomecanvas_minor_version
+LIBGNOMECANVAS_MICRO_VERSION=libgnomecanvas_micro_version
+LIBGNOMECANVAS_INTERFACE_AGE=libgnomecanvas_interface_age
+
+dnl libtool versioning from libgnome
+
+LIBGNOMECANVAS_CURRENT=libgnomecanvas_current
+LIBGNOMECANVAS_REVISION=libgnomecanvas_revision
+LIBGNOMECANVAS_AGE=libgnomecanvas_age

 AC_SUBST(LIBGNOMECANVAS_CURRENT)
 AC_SUBST(LIBGNOMECANVAS_REVISION)
 AC_SUBST(LIBGNOMECANVAS_AGE)

+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libgnomecanvas, $LIBGNOMECANVAS_VERSION)

 AM_MAINTAINER_MODE

@ -48,29 +70,19 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package])

 ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gu he hi hr hu id is it ja kn ko li lt lv mk ml mn ms ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta tr uk vi wa yi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
-gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(gnomelocaledir)
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-
-GTK_REQUIRED=2.0.3
-LIBART_REQUIRED=2.3.8
-PANGO_REQUIRED=1.0.1
-LIBGLADE_REQUIRED=2.0.0
+AM_GLIB_DEFINE_LOCALEDIR([GNOMECANVASLOCALEDIR])

 dnl
 dnl GTK+ check
 dnl
-CANVAS_MODULES="gtk+-2.0 >= $GTK_REQUIRED libart-2.0 >= $LIBART_REQUIRED pango >= $PANGO_REQUIRED pangoft2 >= $PANGO_REQUIRED"
+CANVAS_MODULES="dnl
+  gtk+-2.0 >= gtk_required_version dnl
+  libart-2.0 >= libart_required_version dnl
+  pango >= pango_required_version dnl
+  pangoft2 >= pango_required_version"
 PKG_CHECK_MODULES(LIBGNOMECANVAS, $CANVAS_MODULES)
-AC_SUBST(LIBGNOMECANVAS_CFLAGS)
-AC_SUBST(LIBGNOMECANVAS_LIBS)

-PKG_CHECK_MODULES(CANVAS_GLADE, $CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED)
-AC_SUBST(CANVAS_GLADE_CFLAGS)
-AC_SUBST(CANVAS_GLADE_LIBS)
+PKG_CHECK_MODULES(CANVAS_GLADE, $CANVAS_MODULES libglade-2.0 >= libglade_required_version)

 AC_MSG_CHECKING([for native Win32])
 case "$host" in
@ -141,58 +153,14 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 dnl
 dnl Check for gtk-doc
 dnl
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-
-AC_SUBST(HTML_DIR)
-
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-
-gtk_doc_min_version=0.6
-if $GTKDOC ; then 
-    gtk_doc_version=`gtkdoc-mkdb --version`
-    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
-
-    IFS="${IFS= 	}"; gtk_save_IFS="$IFS"; IFS="."
-    set $gtk_doc_version
-    for min in $gtk_doc_min_version ; do
-        cur=$1; shift
-        if test -z $min ; then break; fi
-        if test -z $cur ; then GTKDOC=false; break; fi
-        if test $cur -gt $min ; then break ; fi
-        if test $cur -lt $min ; then GTKDOC=false; break ; fi
-    done
-    IFS="$gtk_save_IFS"
-
-   if $GTKDOC ; then
-      AC_MSG_RESULT(yes)
-   else
-      AC_MSG_RESULT(no)
-      GTKDOC=false
-   fi
-fi
-
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no 
-  fi
-fi
-
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])

 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
-AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
+AC_ARG_ENABLE(rebuilds,
+              AC_HELP_STRING([--disable-rebuilds],
+                             [disable all source autogeneration rules]),,
+              [enable_rebuilds=yes])
 REBUILD=\#
 if test "x$enable_rebuilds" = "xyes" && \
     test -n "$PERL" && \
@ -202,7 +170,7 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)

-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 libgnomecanvas/Makefile
@ -215,4 +183,4 @@ docs/Makefile
 docs/reference/Makefile
 ])

-
+AC_OUTPUT
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@ -8,10 +8,8 @@ INCLUDES = \
        -DGNOMECANVASPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
        -DGNOMECANVASBINDIR=\""$(bindir)"\" 		\
        -DGNOMECANVASLOCALSTATEDIR=\""$(localstatedir)"\" 	\
-        -DGNOMECANVASLOCALEDIR=\""$(gnomelocaledir)"\" 	\
 	-DGTK_VERSION=\""$(GTK_VERSION)"\"		\
-	-DG_LOG_DOMAIN=\"GnomeCanvas\"			\
-	-DVERSION=\"$(VERSION)\"
+	-DG_LOG_DOMAIN=\"GnomeCanvas\"

 LDADD =	\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@ -1,25 +1,21 @@
 ## Process this file with automake to produce Makefile.in

+AUTOMAKE_OPTIONS = 1.6
+
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=libgnomecanvas

 # The top-level SGML file. Change it if you want.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml

+# Extra options to supply to gtkdoc-scan.
+SCAN_OPTIONS=
+
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting functions and macros.
 DOC_SOURCE_DIR=../../libgnomecanvas

-# Extra options to supply to gtkdoc-scan.
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-fixref.
-FIXXREF_OPTIONS=
-
 # Used for dependencies.
 HFILE_GLOB=$(top_srcdir)/libgnomecanvas/*.h
 CFILE_GLOB=$(top_srcdir)/libgnomecanvas/*.c
@ -28,149 +24,22 @@ CFILE_GLOB=$(top_srcdir)/libgnomecanvas/*.c
 IGNORE_HFILES=gnome-canvas-shape-private.h gnome-canvas-i18n.h \
  gnome-canvas-marshal.h

-# Images to copy into HTML directory.
-HTML_IMAGES =
+# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
+# contains GtkObjects/GObjects and you want to document signals and properties.
+INCLUDES = -I$(top_srcdir) $(LIBGNOMECANVAS_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
+  $(LIBGNOMECANVAS_LIBS)
+
+# Extra options to supply to gtkdoc-mkdb.
+MKDB_OPTIONS=--sgml-mode --output-format=xml

 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files =

-# Other files to distribute.
-extra_files =
+# Images to copy into HTML directory.
+HTML_IMAGES =

-# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
-# contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGNOMECANVAS_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
-  $(LIBGNOMECANVAS_LIBS)
+# Extra options to supply to gtkdoc-fixref.
+FIXXREF_OPTIONS=

-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
-
-####################################
-# Everything below here is generic #
-####################################
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(extra_files)			\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		\
-	$(DOC_MODULE).args 	\
-	$(DOC_MODULE).hierarchy \
-	$(DOC_MODULE).signals
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-#### scan ####
-
-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) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### sgml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
-	@echo '*** Building SGML ***'
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-endif
-
-##############
-
-clean-local:
-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	fi)
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-
-.PHONY : dist-hook-local
+include $(top_srcdir)/gtk-doc.make
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@ -23,9 +23,7 @@ INCLUDES = \
        -DGNOMECANVASPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
        -DGNOMECANVASBINDIR=\""$(bindir)"\" 		\
        -DGNOMECANVASLOCALSTATEDIR=\""$(localstatedir)"\" 	\
-        -DGNOMECANVASLOCALEDIR=\""$(gnomelocaledir)"\" 	\
-	-DG_LOG_DOMAIN=\"GnomeCanvas\"			\
-	-DVERSION=\"$(VERSION)\"
+	-DG_LOG_DOMAIN=\"GnomeCanvas\"

 lib_LTLIBRARIES = libgnomecanvas-2.la

@ -86,6 +84,8 @@ gnome-canvas-marshal.h: gnome-canvas-marshal.list $(GLIB_GENMARSHAL)
 gnome-canvas-marshal.c: gnome-canvas-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --body --prefix=gnome_canvas_marshal > $@

+CLEANFILES = $(marshal_sources)
+
 EXTRA_DIST = \
 	gnome-canvas-marshal.list	\
 	libgnomecanvas-2.0.pc.in	\
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -13,7 +13,7 @@ INCLUDES = \

 LDADD = $(CANVAS_GLADE_LIBS)

-LDFLAGS = -export-dynamic
+AM_LDFLAGS = -export-dynamic

 test_libglade_canvas_SOURCE = test-libglade-canvas.c