diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-06 01:03:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-06 01:03:19 +0000 |
| commit | c30fb2a44a00e7c63f9ff36d5428d47c0449e59a (patch) | |
| tree | c51f747a4727325cf441a8347a85e4309ad6bbe4 | |
| parent | d3b1655142c41c1ecd0417b154c99a3c35ec338a (diff) | |
| download | atk-c30fb2a44a00e7c63f9ff36d5428d47c0449e59a.tar.gz | |
ATK 1.0.0 rc1ATK_1_0_0_RC1
Tue Mar 5 16:54:21 2002 Owen Taylor <otaylor@redhat.com>
* ATK 1.0.0 rc1
* tests/Makefile.am: Don't install libteststateset.la,
libtestrelation.la. (#73655, James Henstridge)
* autogen.sh: Add --enable-gtk-doc
* configure.in: --disable-gtk-doc by default.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | Makefile.am | 24 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
5 files changed, 44 insertions, 5 deletions
@@ -1,3 +1,18 @@ +Tue Mar 5 16:54:21 2002 Owen Taylor <otaylor@redhat.com> + + * ATK 1.0.0 rc1 + + * tests/Makefile.am: Don't install libteststateset.la, + libtestrelation.la. (#73655, James Henstridge) + + * autogen.sh: Add --enable-gtk-doc + + * configure.in: --disable-gtk-doc by default. + + * Makefile.am: Add a slightly modified distcheck rule + that passes --enable-gtk-doc to the configure inside. + (So that 'make dist' succeeds inside.) + Tue Mar 5 11:55:35 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Require GLib-2.0.0. diff --git a/Makefile.am b/Makefile.am index e9a2439..103dee3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,27 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atk.pc + +# This is a version of the automake-1.4 distcheck rule modified +# to pass --enable-gtk-doc to ./configure +# +mydistcheck: dist + -rm -rf $(distdir) + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" @@ -79,7 +79,7 @@ autoconf cd $ORIGDIR if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode "$@" + $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@" echo echo "Now type 'make' to compile $PROJECT." diff --git a/configure.in b/configure.in index 884d26a..9699305 100644 --- a/configure.in +++ b/configure.in @@ -139,10 +139,10 @@ EOF 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) +dnl Disable the gtk-doc stuff by default to avoid Jade hassles +AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=no) -if test x$enable_gtk_doc = xauto ; then +if test x$enable_gtk_doc = xyes ; then if test x$GTKDOC = xtrue ; then enable_gtk_doc=yes else diff --git a/tests/Makefile.am b/tests/Makefile.am index cb96b4b..b4e804c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -lib_LTLIBRARIES = \ +noinst_LTLIBRARIES = \ libteststateset.la \ libtestrelation.la |