From 5443b74a151f9923a46870693ae03c832f090ef3 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 18 May 2001 14:01:39 +0000 Subject: [PATCH] Regen. --- ChangeLog | 2 +- Makefile.in | 10 +++---- lib/Automake/Makefile.in | 38 ++++++++++++--------------- lib/Makefile.in | 56 +++++++++++++++++++--------------------- lib/am/Makefile.in | 41 ++++++++++++----------------- m4/Makefile.in | 38 ++++++++++++--------------- 6 files changed, 79 insertions(+), 106 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ac6cc68..f36059ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,7 +144,7 @@ libtool.am, lisp.am, ltlib.am, ltlibrary.am, mans-vars.am, mans.am, multilib.am, program.am, progs.am, python.am, remake-hdr.am, scripts.am, subdirs.am, tags.am, texi-vers.am, - texibuild.am, texinfos.am, yacc.am: Moved to lib/am/. + texibuild.am, texinfos.am, yacc.am: Moved to lib/am/. * configure.in (AC_OUTPUT): Added lib/am/Makefile. (AUTOMAKE): Use --libdir, not --amdir. Ues AC_CONFIG_AUX_DIR. diff --git a/Makefile.in b/Makefile.in index ed470608..bbafb9ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -131,9 +131,6 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -maintainer-clean-conf: - -rm -f configure aclocal.m4 automake: $(top_builddir)/config.status automake.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status aclocal: $(top_builddir)/config.status aclocal.in @@ -446,7 +443,8 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -457,7 +455,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-recursive clean-am: clean-generic mostlyclean-am @@ -512,8 +509,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-conf maintainer-clean-generic \ - maintainer-clean-vti + maintainer-clean-generic maintainer-clean-vti mostlyclean: mostlyclean-recursive diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 1515b4ca..64b1f8d5 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -13,7 +13,6 @@ @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ @@ -34,11 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -52,7 +49,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -86,15 +82,14 @@ DIST_COMMON = $(dist_perllib_DATA) Makefile.am Makefile.in all: all-am .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits lib/Automake/Makefile - + $(AUTOMAKE) --gnu lib/Automake/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(perllibdir) @@ -123,7 +118,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ $(mkinstalldirs) "$(distdir)/$$dir"; \ @@ -153,23 +148,20 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am - install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install - + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-am clean-am: clean-generic mostlyclean-am @@ -178,11 +170,11 @@ distclean: distclean-am distclean-am: clean-am distclean-generic -dvi: +dvi: dvi-am dvi-am: -info: +info: info-am info-am: @@ -190,7 +182,7 @@ install-data-am: install-dist_perllibDATA install-exec-am: -install-info: +install-info: install-info-am install-man: @@ -204,17 +196,19 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-dist_perllibDATA +uninstall-am: uninstall-dist_perllibDATA uninstall-info-am + +uninstall-info: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am \ install-dist_perllibDATA install-exec install-exec-am \ - install-info install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am uninstall-dist_perllibDATA - + uninstall uninstall-am uninstall-dist_perllibDATA \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/Makefile.in b/lib/Makefile.in index 8966f096..54c846db 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -13,7 +13,6 @@ @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ @@ -34,11 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -52,7 +49,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -89,7 +85,8 @@ DIST_SOURCES = DATA = $(dist_pkgdata_DATA) $(dist_script_DATA) -RECURSIVE_TARGETS = all-recursive install-data-recursive \ +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(dist_pkgdata_DATA) $(dist_script_DATA) COPYING INSTALL \ @@ -100,15 +97,14 @@ DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits lib/Makefile - + $(AUTOMAKE) --gnu lib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @@ -243,7 +239,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ $(mkinstalldirs) "$(distdir)/$$dir"; \ @@ -273,7 +269,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-recursive all-am: Makefile $(DATA) - installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir) @@ -287,23 +282,20 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-recursive - install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install - + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-recursive clean-am: clean-generic mostlyclean-am @@ -312,11 +304,11 @@ distclean: distclean-recursive distclean-am: clean-am distclean-generic distclean-tags -dvi: +dvi: dvi-recursive dvi-am: -info: +info: info-recursive info-am: @@ -326,7 +318,7 @@ install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA install-exec-am: -install-info: +install-info: install-info-recursive install-man: @@ -340,22 +332,27 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \ + uninstall-info-am + +uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \ clean-generic clean-recursive distclean distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-data-recursive install-dist_pkgdataDATA \ - install-dist_scriptDATA install-exec install-exec-am \ - install-exec-recursive install-info install-man \ - install-recursive install-strip installcheck installcheck-am \ - installcheck-local installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-dist_pkgdataDATA install-dist_scriptDATA install-exec \ + install-exec-am install-exec-recursive install-info \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installcheck-local \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ mostlyclean-recursive tags tags-recursive uninstall \ uninstall-am uninstall-dist_pkgdataDATA \ - uninstall-dist_scriptDATA uninstall-recursive + uninstall-dist_scriptDATA uninstall-info-recursive \ + uninstall-recursive install-data-hook: @@ -369,7 +366,6 @@ installcheck-local: for file in $(dist_script_DATA); do \ $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \ done - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index ae016d0c..17481305 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -13,7 +13,6 @@ @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ @@ -34,11 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -52,7 +49,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -94,15 +90,14 @@ DIST_COMMON = $(dist_am_DATA) Makefile.am Makefile.in all: all-am .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits lib/am/Makefile - + $(AUTOMAKE) --gnu lib/am/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: install-dist_amDATA: $(dist_am_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(amdir) @@ -131,7 +126,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ $(mkinstalldirs) "$(distdir)/$$dir"; \ @@ -161,23 +156,20 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am - install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install - + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-am clean-am: clean-generic mostlyclean-am @@ -186,11 +178,11 @@ distclean: distclean-am distclean-am: clean-am distclean-generic -dvi: +dvi: dvi-am dvi-am: -info: +info: info-am info-am: @@ -198,7 +190,7 @@ install-data-am: install-dist_amDATA install-exec-am: -install-info: +install-info: install-info-am install-man: @@ -212,17 +204,18 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-dist_amDATA +uninstall-am: uninstall-dist_amDATA uninstall-info-am + +uninstall-info: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-dist_amDATA \ - install-exec install-exec-am install-info install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic uninstall uninstall-am \ - uninstall-dist_amDATA - + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic uninstall uninstall-am \ + uninstall-dist_amDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/m4/Makefile.in b/m4/Makefile.in index b65908df..9223b243 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -13,7 +13,6 @@ @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ @@ -34,11 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -52,7 +49,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -96,15 +92,14 @@ DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnits m4/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: install-m4dataDATA: $(m4data_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(m4datadir) @@ -133,7 +128,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ $(mkinstalldirs) "$(distdir)/$$dir"; \ @@ -163,23 +158,20 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am - install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install - + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-am clean-am: clean-generic mostlyclean-am @@ -188,11 +180,11 @@ distclean: distclean-am distclean-am: clean-am distclean-generic -dvi: +dvi: dvi-am dvi-am: -info: +info: info-am info-am: @@ -200,7 +192,7 @@ install-data-am: install-m4dataDATA install-exec-am: -install-info: +install-info: install-info-am install-man: @@ -214,16 +206,18 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-m4dataDATA +uninstall-am: uninstall-info-am uninstall-m4dataDATA + +uninstall-info: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ - install-exec-am install-info install-m4dataDATA install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic uninstall uninstall-am uninstall-m4dataDATA - + install-exec-am install-info install-info-am install-m4dataDATA \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic uninstall uninstall-am \ + uninstall-info-am uninstall-m4dataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.43.5