[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog Makefile.in aclocal.m4 Test...
From: |
Patrice Dumas |
Subject: |
[Texi2html-cvs] texi2html ChangeLog Makefile.in aclocal.m4 Test... |
Date: |
Thu, 20 Mar 2008 09:05:47 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 08/03/20 09:05:47
Modified files:
. : ChangeLog Makefile.in aclocal.m4
Tests : Makefile.am Makefile.in
Tests/ccvs_mediawiki_nosplit_res: cvs
Tests/ccvs_mediawiki_res: `cvs: Overview'
doc : Makefile.in
Log message:
* Makefile.am,...: better handling of mediawiki tests and
regenerate
with automake 1.10.1.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.288&r2=1.289
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.in?cvsroot=texi2html&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texi2html/aclocal.m4?cvsroot=texi2html&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/Makefile.am?cvsroot=texi2html&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/Makefile.in?cvsroot=texi2html&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/ccvs_mediawiki_nosplit_res/cvs?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/ccvs_mediawiki_res/cvs:%32Overview?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/Makefile.in?cvsroot=texi2html&r1=1.42&r2=1.43
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- ChangeLog 20 Mar 2008 01:42:26 -0000 1.288
+++ ChangeLog 20 Mar 2008 09:05:45 -0000 1.289
@@ -4,6 +4,8 @@
except that the previous chapter is still considered to be the
previous element at its level.
Find previous and next toplevel better.
+ * Makefile.am,...: better handling of mediawiki tests and regenerate
+ with automake 1.10.1.
2008-03-17 Patrice Dumas <address@hidden>
Index: Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- Makefile.in 21 Aug 2007 17:02:03 -0000 1.58
+++ Makefile.in 20 Mar 2008 09:05:45 -0000 1.59
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -490,8 +490,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -516,8 +516,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -527,13 +527,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -603,6 +602,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -631,6 +634,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -788,19 +793,19 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am html-local info \
- info-am install install-am install-binSCRIPTS install-data \
- install-data-am install-dist_i18nDATA install-dist_imagesDATA \
- install-dist_pkgdataDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-binSCRIPTS \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am html-local \
+ info info-am install install-am install-binSCRIPTS \
+ install-data install-data-am install-dist_i18nDATA \
+ install-dist_imagesDATA install-dist_pkgdataDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \
uninstall-dist_i18nDATA uninstall-dist_imagesDATA \
uninstall-dist_pkgdataDATA
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/texi2html/texi2html/aclocal.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- aclocal.m4 21 Aug 2007 17:02:03 -0000 1.31
+++ aclocal.m4 20 Mar 2008 09:05:45 -0000 1.32
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically
`autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -47,8 +50,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -141,13 +146,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -252,16 +257,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -510,7 +516,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Index: Tests/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Tests/Makefile.am 30 Sep 2007 12:47:12 -0000 1.25
+++ Tests/Makefile.am 20 Mar 2008 09:05:46 -0000 1.26
@@ -13,7 +13,8 @@
navigation_chapter_no_nav_vert navigation_section_no_header \
navigation_chapter_vert navigation_section_no_nav \
navigation_node navigation_section_no_nav_vert \
- navigation_node_no_header navigation_section_vert
+ navigation_node_no_header navigation_section_vert ccvs_mediawiki \
+ ccvs_mediawiki_nosplit
@@ -28,6 +29,8 @@
formatting_res/tex_in_copying.2 formatting_res/math_not_closed.2 \
tex_httex_res/tex.2 tex_httex_res/*_tex4ht_*.html
-rm -f singular_res/*_l2h.html singular_res/sing.2
+ cp ccvs_mediawiki/cvs:* ccvs_mediawiki_res
+ cp ccvs_mediawiki_nosplit/cvs ccvs_mediawiki_nosplit_res
clean-local:
for dir in ${SUBDIR_TESTS}; do \
Index: Tests/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/Makefile.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Tests/Makefile.in 30 Sep 2007 12:47:12 -0000 1.46
+++ Tests/Makefile.in 20 Mar 2008 09:05:46 -0000 1.47
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -142,7 +142,8 @@
navigation_chapter_no_nav_vert navigation_section_no_header \
navigation_chapter_vert navigation_section_no_nav \
navigation_node navigation_section_no_nav_vert \
- navigation_node_no_header navigation_section_vert
+ navigation_node_no_header navigation_section_vert ccvs_mediawiki \
+ ccvs_mediawiki_nosplit
all: all-am
@@ -316,6 +317,8 @@
formatting_res/tex_in_copying.2 formatting_res/math_not_closed.2 \
tex_httex_res/tex.2 tex_httex_res/*_tex4ht_*.html
-rm -f singular_res/*_l2h.html singular_res/sing.2
+ cp ccvs_mediawiki/cvs:* ccvs_mediawiki_res
+ cp ccvs_mediawiki_nosplit/cvs ccvs_mediawiki_nosplit_res
clean-local:
for dir in ${SUBDIR_TESTS}; do \
Index: Tests/ccvs_mediawiki_nosplit_res/cvs
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/ccvs_mediawiki_nosplit_res/cvs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/ccvs_mediawiki_nosplit_res/cvs 12 Mar 2008 10:24:12 -0000
1.1
+++ Tests/ccvs_mediawiki_nosplit_res/cvs 20 Mar 2008 09:05:46 -0000
1.2
@@ -50,7 +50,7 @@
<tr><td valign="middle" align="left">|[[#SEC_Top| < ]]|</td>
<td valign="middle" align="left">|[[#SEC2| > ]]|</td>
<td valign="middle" align="left"> </td>
-<td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">|[[#SEC_Top| << ]]|</td>
<td valign="middle" align="left">|[[#SEC_Top| Up ]]|</td>
<td valign="middle" align="left">|[[#SEC9| >> ]]|</td>
<td valign="middle" align="left"> </td>
Index: Tests/ccvs_mediawiki_res/cvs: Overview
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/ccvs_mediawiki_res/cvs: Overview,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/ccvs_mediawiki_res/cvs: Overview 12 Mar 2008 10:24:15 -0000
1.1
+++ Tests/ccvs_mediawiki_res/cvs: Overview 20 Mar 2008 09:05:46 -0000
1.2
@@ -4,7 +4,7 @@
<tr><td valign="middle" align="left">|[[cvs#SEC_Top| < ]]|</td>
<td valign="middle" align="left">|[[#SEC2| > ]]|</td>
<td valign="middle" align="left"> </td>
-<td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">|[[cvs#SEC_Top| << ]]|</td>
<td valign="middle" align="left">|[[cvs#SEC_Top| Up ]]|</td>
<td valign="middle" align="left">|[cvs: The Repository#SEC9 >> ]|</td>
<td valign="middle" align="left"> </td>
Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- doc/Makefile.in 21 Aug 2007 17:02:10 -0000 1.42
+++ doc/Makefile.in 20 Mar 2008 09:05:47 -0000 1.43
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog Makefile.in aclocal.m4 Test...,
Patrice Dumas <=