diff options
26 files changed, 83 insertions, 61 deletions
@@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html): Remove rule. + 2003-11-30 Bruno Haible <bruno@clisp.org> * config/install-reloc: Compile also the allocsa.c file. diff --git a/Makefile.am b/Makefile.am index 7c89f20..9486975 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,9 +57,3 @@ EXTRA_DIST += README.vms Makefile.vms \ EXTRA_DIST += README.woe32 Makefile.msvc EXTRA_DIST += README.mingw - - -# Documentation tag not known to automake. - -html: - cd gettext-tools && $(MAKE) html diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog index 1ecea8b..8908130 100644 --- a/autoconf-lib-link/ChangeLog +++ b/autoconf-lib-link/ChangeLog @@ -1,3 +1,10 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html): Remove rule. + (distclean-local): Renamed from distclean-am. + * tests/Makefile.am (distclean-local): Renamed from distclean-am. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am index 3844f47..4463794 100644 --- a/autoconf-lib-link/Makefile.am +++ b/autoconf-lib-link/Makefile.am @@ -74,15 +74,10 @@ config/config.rpath: $(srcdir)/config.rpath config-dir DISTCLEANFILES += config/config.guess config/config.sub config/install-sh config/ltmain.sh config/mkinstalldirs config/missing config/config.rpath -distclean-am: +distclean-local: rm -rf config config-dir -# Documentation tag not known to automake. - -html: - - # Subdirectories with separate autoconfiguration. CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/aclocal.m4 $(srcdir)/tests/rpathx/configure diff --git a/autoconf-lib-link/tests/Makefile.am b/autoconf-lib-link/tests/Makefile.am index 3424f61..4eeded3 100644 --- a/autoconf-lib-link/tests/Makefile.am +++ b/autoconf-lib-link/tests/Makefile.am @@ -75,5 +75,5 @@ rpathcfg: rpathcfg.sh MOSTLYCLEANFILES += rpathcfg rpathcfg.log # Clean up the intermediate directory created by running the tests. -distclean-am: +distclean-local: rm -rf tstdir @@ -1,4 +1,4 @@ -# This script requires autoconf-2.58..2.59 and automake-1.7.3..1.7.9 in the PATH. +# This script requires autoconf-2.58..2.59 and automake-1.8 in the PATH. aclocal autoconf diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index f9cb83e..28a926b 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html): Remove rule. + 2003-11-30 Bruno Haible <bruno@clisp.org> * configure.ac: Invoke gl_ALLOCSA instead of gl_FUNC_ALLOCA. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 174726c..5bdbddc 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -34,12 +34,6 @@ gettextsrcdir = $(datadir)/gettext gettextsrc_DATA = ABOUT-NLS -# Documentation tag not known to automake. - -html: - cd doc && $(MAKE) html - - all-local: ABOUT-NLS ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi diff --git a/gettext-runtime/doc/ChangeLog b/gettext-runtime/doc/ChangeLog index 6b7e617..877d589 100644 --- a/gettext-runtime/doc/ChangeLog +++ b/gettext-runtime/doc/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html): Remove rule. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/gettext-runtime/doc/Makefile.am b/gettext-runtime/doc/Makefile.am index 111050a..0f3400e 100644 --- a/gettext-runtime/doc/Makefile.am +++ b/gettext-runtime/doc/Makefile.am @@ -25,11 +25,6 @@ EXTRA_DIST += nls.texi matrix.texi EXTRA_DIST += rt-gettext.texi rt-ngettext.texi rt-envsubst.texi -# Documentation tag not known to automake. - -html: - - # VMS support. EXTRA_DIST += Makefile.vms diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 2770190..b14eb19 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,11 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (clean-local): Renamed from clean-am. + (html-local): Renamed from html. + (ps, pdf, .texi.pdf): Remove rules. + (TEXI2PDF): Remove variable. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index f8986f9..d50ed24 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am @@ -70,7 +70,7 @@ MOSTLYCLEANFILES += alloca.h # Clean up after Solaris cc. -clean-am: +clean-local: rm -rf SunWS_cache @@ -92,7 +92,7 @@ info_TEXINFOS = autosprintf.texi # make autosprintf.ps # make autosprintf.pdf -all-local: html +all-local: html-local install-data-local: install-html installdirs-local: installdirs-html uninstall-local: uninstall-html @@ -123,8 +123,6 @@ MOSTLYCLEANFILES += #DVIPS = @DVIPS@ DVIPS = @DVIPS@ -D600 -ps: autosprintf.ps - autosprintf.ps: autosprintf.dvi $(DVIPS) -o $@ `if test -f autosprintf.dvi; then echo autosprintf.dvi; else echo $(srcdir)/autosprintf.dvi; fi` @@ -141,15 +139,8 @@ uninstall-ps: # Documentation in Portable Document Format. -TEXI2PDF = @TEXI2PDF@ SUFFIXES = .pdf -pdf: autosprintf.pdf - -.texi.pdf: - TEXINPUTS=.:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2PDF) $< - install-pdf: autosprintf.pdf $(mkinstalldirs) $(DESTDIR)$(pdfdir) $(INSTALL_DATA) `if test -f autosprintf.pdf; then echo .; else echo $(srcdir); fi`/autosprintf.pdf $(DESTDIR)$(pdfdir)/autosprintf.pdf @@ -165,7 +156,7 @@ uninstall-pdf: TEXI2HTML = @PERL@ $(srcdir)/texi2html -html: autosprintf.html +html-local: autosprintf.html # Override of automake's definition. # We want to use texi2html, not makeinfo --html. diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog index 858d26c..beeb5db 100644 --- a/gettext-runtime/man/ChangeLog +++ b/gettext-runtime/man/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html-local): Renamed from html. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am index e8ca9ee..ad649fc 100644 --- a/gettext-runtime/man/Makefile.am +++ b/gettext-runtime/man/Makefile.am @@ -71,7 +71,7 @@ MAN2HTML = groff -mandoc -Thtml # make man # make html -all-local: html +all-local: html-local install-data-local: install-html installdirs-local: installdirs-html uninstall-local: uninstall-html @@ -128,7 +128,7 @@ bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version # Man pages in HTML format. -html: $(man_HTML) +html-local: $(man_HTML) gettext.1.html: gettext.1.html.in Makefile sed -e 's|@''localedir''@|$(localedir)|g' < `if test -f gettext.1.html.in; then echo .; else echo $(srcdir); fi`/gettext.1.html.in > t-$@ diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index df6e7b1..838b2bd 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html): Remove rule. + 2003-11-30 Bruno Haible <bruno@clisp.org> * configure.ac: Remove computation of LTALLOCA. diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index df2d0c8..16b3449 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -38,12 +38,6 @@ $(srcdir)/ABOUT-NLS: $(srcdir)/../gettext-runtime/ABOUT-NLS cp $(srcdir)/../gettext-runtime/ABOUT-NLS $(srcdir)/ABOUT-NLS -# Documentation tag not known to automake. - -html: - cd doc && $(MAKE) html - - # VMS support. config.h_vms: config.h.in ../version.sh diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index e6b03b9..1d188c5 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,10 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (stamp-vti): Is in $(srcdir). + (html-local): Renamed from html. + (ps, pdf, .texi.pdf): Remove rules. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am index c8cfd1b..0c1b593 100644 --- a/gettext-tools/doc/Makefile.am +++ b/gettext-tools/doc/Makefile.am @@ -62,7 +62,7 @@ iso-3166.texi: ISO_3166 iso-3166.sed # The dependencies of stamp-vti generated by automake are incomplete. # So we have to duplicate the entire rule which would otherwise be generated # by automake. -stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh +$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh (dir=.; test -f ./gettext.texi || dir=$(srcdir); \ set `$(SHELL) $(top_srcdir)/../config/mdate-sh $$dir/gettext.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ @@ -81,14 +81,14 @@ stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh # make gettext.pdf # make gettext.html -all-local: html +all-local: html-local install-data-local: install-html installdirs-local: installdirs-html uninstall-local: uninstall-html # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: dist-html -html: html-split +html-local: html-split install-html: install-html-split uninstall-html: uninstall-html-split dist-html: dist-html-split @@ -134,8 +134,6 @@ MOSTLYCLEANFILES += \ #DVIPS = @DVIPS@ DVIPS = @DVIPS@ -D600 -ps: gettext.ps - gettext.ps: gettext.dvi $(DVIPS) -o $@ `if test -f gettext.dvi; then echo gettext.dvi; else echo $(srcdir)/gettext.dvi; fi` @@ -157,12 +155,6 @@ uninstall-ps: TEXI2PDF = @TEXI2PDF@ $(TEXINCLUDES) SUFFIXES = .pdf -pdf: gettext.pdf - -.texi.pdf: - TEXINPUTS=.:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2PDF) $< - install-pdf: gettext.pdf $(mkinstalldirs) $(DESTDIR)$(pdfdir) $(INSTALL_DATA) `if test -f gettext.pdf; then echo .; else echo $(srcdir); fi`/gettext.pdf $(DESTDIR)$(pdfdir)/gettext.pdf diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 4fd455e..8490419 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (install-exec-local): Renamed from install-exec-am. + 2003-11-30 Bruno Haible <bruno@clisp.org> * alloca.c: Remove file. diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am index a1934b1..1685caf 100644 --- a/gettext-tools/lib/Makefile.am +++ b/gettext-tools/lib/Makefile.am @@ -117,7 +117,7 @@ libgettextlib_la_LDFLAGS = \ @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined # No need to install libgettextlib.a. -install-exec-am: install-exec-clean +install-exec-local: install-libLTLIBRARIES install-exec-clean install-exec-clean: $(RM) $(DESTDIR)$(libdir)/libgettextlib.a diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog index 1fe9b06..8799b2d 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/man/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (html-local): Renamed from html. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am index 47968cc..7c182de 100644 --- a/gettext-tools/man/Makefile.am +++ b/gettext-tools/man/Makefile.am @@ -68,7 +68,7 @@ MAN2HTML = groff -mandoc -Thtml # make man # make html -all-local: html +all-local: html-local install-data-local: install-html installdirs-local: installdirs-html uninstall-local: uninstall-html @@ -130,7 +130,7 @@ update-man1: # Man pages in HTML format. -html: $(man_HTML) +html-local: $(man_HTML) msgcmp.1.html: msgcmp.1 $(MAN2HTML) `if test -f msgcmp.1; then echo .; else echo $(srcdir); fi`/msgcmp.1 | sed -e '/CreationDate:/d' > t-$@ diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 598cba8..41f3922 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (install-exec-local): Renamed from install-exec-am. + 2003-11-30 Bruno Haible <bruno@clisp.org> * format-java.c: Include xallocsa.h. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 0737e27..5731ac4 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -146,7 +146,7 @@ libgettextsrc_la_LDFLAGS = \ ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined # No need to install libgettextsrc.a. -install-exec-am: install-exec-clean +install-exec-local: install-libLTLIBRARIES install-exec-clean install-exec-clean: $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 90e2a2e..3d4e1e3 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,8 @@ +2003-12-12 Bruno Haible <bruno@clisp.org> + + Assume automake-1.8. + * Makefile.am (clean-local): Renamed from clean-am. + 2003-12-17 Bruno Haible <bruno@clisp.org> * gettext-0.13.1 released. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 2076270..ba13482 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -171,7 +171,7 @@ fc4_SOURCES = format-c-4-prg.c setlocale.c fc4_LDADD = ../lib/libgettextlib.la $(LDADD) # Clean up after Solaris cc. -clean-am: +clean-local: rm -rf SunWS_cache |