From b18ca5fb2806d819564e5125fe776dcbc5e3685d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Dec 1996 21:05:08 +0000 Subject: [PATCH] installs now 'quiet' --- ChangeLog | 10 ++++++++++ Makefile.in | 37 ++++++++++++++++++++++--------------- TODO | 34 ++++------------------------------ data.am | 4 +++- header.am | 3 ++- lib/am/data.am | 4 +++- lib/am/header.am | 3 ++- lib/am/libs.am | 4 +++- lib/am/lisp.am | 4 +++- lib/am/progs.am | 3 ++- lib/am/scripts.am | 7 ++++--- lib/am/subdirs.am | 5 +++-- lib/am/texinfos.am | 6 ++++-- libs.am | 4 +++- lisp.am | 4 +++- ltlibs.am | 3 ++- m4/Makefile.in | 14 ++++++++------ progs.am | 3 ++- scripts.am | 7 ++++--- subdirs.am | 5 +++-- tests/Makefile.in | 13 +++++++------ texinfos.am | 6 ++++-- 22 files changed, 101 insertions(+), 82 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d65d408..d70e3ddf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ Sun Dec 8 12:29:52 1996 Tom Tromey + * subdirs.am (maintainer-clean-recursive): Make commands quiet. + * texinfos.am: Make commands quiet. + * scripts.am: Make commands quiet. + * progs.am: Make commands quiet. + * ltlibs.am: Make comamnds quiet. + * lisp.am: Make commands quiet. + * libs.am: Make commands quiet. + * header.am: Make commands quiet. + * data.am: Make commands quiet. + * automake.in (variable_value_as_list): Handle := substitution references. (am_conf_line_error): Take file argument. Changed all callers. diff --git a/Makefile.in b/Makefile.in index 0a65d136..d7ab5325 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ PERL = @PERL@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 @@ -84,9 +87,6 @@ configure.in elisp-comp install-sh interlock mdate-sh mkinstalldirs \ stamp-vti texinfo.tex version.texi ylwrap -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -95,7 +95,7 @@ default: all .SUFFIXES: .SUFFIXES: .texi .texinfo .info .dvi -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --gnits Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -117,12 +117,13 @@ aclocal: $(top_builddir)/config.status aclocal.in install-binSCRIPTS: $(bin_SCRIPTS) $(NORMAL_INSTALL) $(mkinstalldirs) $(bindir) - list="$(bin_SCRIPTS)"; for p in $$list; do \ + @list="$(bin_SCRIPTS)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ else if test -f $(srcdir)/$$p; then \ - $(INSTALL_SCRIPT) $(srcdir)/$$p \ - $(bindir)/`echo $$p|sed '$(transform)'`; \ + echo "$(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; fi; \ done @@ -134,12 +135,13 @@ uninstall-binSCRIPTS: install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) $(NORMAL_INSTALL) $(mkinstalldirs) $(pkgdatadir) - list="$(pkgdata_SCRIPTS)"; for p in $$list; do \ + @list="$(pkgdata_SCRIPTS)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ $(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ else if test -f $(srcdir)/$$p; then \ - $(INSTALL_SCRIPT) $(srcdir)/$$p \ - $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ + echo "$(INSTALL_SCRIPT) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ else :; fi; fi; \ done @@ -195,16 +197,18 @@ DVIPS = dvips install-info-am: $(INFO_DEPS) $(NORMAL_INSTALL) $(mkinstalldirs) $(infodir) - for file in $(INFO_DEPS); do \ + @for file in $(INFO_DEPS); do \ for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $(srcdir)/$$ifile; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \ $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \ else : ; fi; \ done; \ done $(POST_INSTALL) - if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ + @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ + echo "install-info --info-dir=$(infodir) $(infodir)/$$file";\ install-info --info-dir=$(infodir) $(infodir)/$$file; :;\ done; \ else : ; fi @@ -243,10 +247,12 @@ maintainer-clean-info: install-pkgdataDATA: $(pkgdata_DATA) $(NORMAL_INSTALL) $(mkinstalldirs) $(pkgdatadir) - list="$(pkgdata_DATA)"; for p in $$list; do \ + @list="$(pkgdata_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(pkgdatadir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(pkgdatadir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(pkgdatadir)/$$p"; \ $(INSTALL_DATA) $$p $(pkgdatadir)/$$p; \ fi; fi; \ done @@ -270,9 +276,10 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - for subdir in $(SUBDIRS); do \ + @for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ - (cd $$subdir && $(MAKE) $$target) \ + echo "Making $$target in $$subdir"; \ + (cd $$subdir && $(MAKE) $$target) \ || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: diff --git a/TODO b/TODO index 27160d8f..7d953421 100644 --- a/TODO +++ b/TODO @@ -1,29 +1,22 @@ Priorities for release: !! documentation (eg new macros) -!! finish up TAGS work -* `acinstall' -* echo in installs? -* `missing' program * copyrights on m4 files, aclocal output For now I guess I'll just have automake give an error if it encounters non-C source in a libtool library specification. - * must split $obj into two parts: one for libtool and one for deansification. Otherwise .S files will be deansified! -* look @ jim's $(t:=foo) problem - * should install-foo target for a new dir (eg fooexecdir) be run via install-data or install-exec? Consider examining name of variable. -* compatibility with older versions of autoconf if not --gnu - ================================================================ +* finish up TAGS work +* `acinstall' +* `missing' program * CONFIG_HEADER is passed incorrectly in ":" mode. - * put parser.h into distribution if "yacc -d" is used * only remove libtool at top level? @@ -38,16 +31,9 @@ rewritten. Or, fix automake so that not all sources in a directory must be ansi. Should also fix things so that a separate ._o file is not needed; instead use a wrapper script. -Gord on pretty-printing instead of raw loops: -Gord> I think the best thing to do is to have make output be a valid shell -Gord> script, and to have it be clear exactly what is happening at a given -Gord> time. - Further: - man page fixes -- consider adding "echo"s to installs again. - users can use make SHELL='sh -x' to get the full dirt Avoid loops when installing; instead unroll them in automake @@ -95,8 +81,6 @@ From Jason Molenda: [ Try GZIP=--best make dist ] * don't assume GNU tar is "tar" (eg in distcheck) -* actually use acinstall program - !! Must fix require_file stuff. It is really gross, and I don't understand it any more. @@ -162,8 +146,7 @@ implemented by noticing whenever a ".o" target with no rules is being emitted, and adding the appropriate compilation rule as appropriate. This should work with targets from Makefile.am as well as from .P files, which means rewriting so that the Makefile.am contents aren't -copied into the output immediately. This feature is probably required -to fully support libtool ("grody compilation issue") +copied into the output immediately. [ this could be probably done more directly by examining the sources as we scan Makefile.am ] @@ -197,13 +180,6 @@ Other priorities: * Must rewrite error handling code. Right now it is a real mess Should fix up require_file junk at the same time -Things to finish libtool support: -* Handle grody compilation issue - Namely: some objects require a different compilation rule -* Handle install changes -* Handle clean changes -* New definition for LINK - djm wants ``LINKS'' variable; list of things to link together after install. In BSD environment, use: LINKS = from1 to1 from2 to2 ... @@ -323,8 +299,6 @@ some support for this. Here are some of the issues: * can do this by looking at subdirs, seeing configure.in and auto-running Automake there -. Consider supporting guile-style PLUGIN directories automatically? - djm says: David> To avoid comments like the one about subdirs getting buried in David> the middle of a Makefile.in, how about pushing comments that diff --git a/data.am b/data.am index 399c4e1f..94502b19 100644 --- a/data.am +++ b/data.am @@ -20,10 +20,12 @@ install-@DIR@DATA: $(@DIR@_DATA) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_DATA)"; for p in $$list; do \ + @list="$(@DIR@_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ fi; fi; \ done diff --git a/header.am b/header.am index 653009c6..2c4435bc 100644 --- a/header.am +++ b/header.am @@ -20,7 +20,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_HEADERS)"; for p in $$list; do \ + @list="$(@DIR@_HEADERS)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ done diff --git a/lib/am/data.am b/lib/am/data.am index 399c4e1f..94502b19 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -20,10 +20,12 @@ install-@DIR@DATA: $(@DIR@_DATA) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_DATA)"; for p in $$list; do \ + @list="$(@DIR@_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ fi; fi; \ done diff --git a/lib/am/header.am b/lib/am/header.am index 653009c6..2c4435bc 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -20,7 +20,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_HEADERS)"; for p in $$list; do \ + @list="$(@DIR@_HEADERS)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ done diff --git a/lib/am/libs.am b/lib/am/libs.am index a5a449a9..b5abb0cc 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -22,6 +22,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## a syntax error in sh. list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ else :; fi; \ done @@ -31,9 +32,10 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. $(POST_INSTALL) - list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ + @list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. + echo "$(RANLIB) $(@DIR@dir)/$$p"; \ $(RANLIB) $(@DIR@dir)/$$p; \ else :; fi; \ done diff --git a/lib/am/lisp.am b/lib/am/lisp.am index af1a0bb3..160dfdfa 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -20,10 +20,12 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_LISP)"; for p in $$list; do \ + @list="$(@DIR@_LISP)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ + echo "$(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \ $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \ else : ; fi; \ done diff --git a/lib/am/progs.am b/lib/am/progs.am index 28c0a574..6b4dc22b 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -20,13 +20,14 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_PROGRAMS)"; for p in $$list; do \ + @list="$(@DIR@_PROGRAMS)"; for p in $$list; do \ if test -f $$p; then \ ## It is harmless to unconditionally use $(LIBTOOL) here because it ## will be null in non-libtoolized packages, and even if it is set to ## a real libtool, its behaviour is identical to normal INSTALL_PROGRAM. ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. + echo "@LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done diff --git a/lib/am/scripts.am b/lib/am/scripts.am index b4d71de7..8696ed8c 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -20,12 +20,13 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_SCRIPTS)"; for p in $$list; do \ + @list="$(@DIR@_SCRIPTS)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else if test -f $(srcdir)/$$p; then \ - $(INSTALL_SCRIPT) $(srcdir)/$$p \ - $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo "$(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; fi; \ done diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index ed0da37f..5b7571de 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -29,9 +29,10 @@ installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ check-recursive installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - for subdir in $(SUBDIRS); do \ + @for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ - (cd $$subdir && $(MAKE) $$target) \ + echo "Making $$target in $$subdir"; \ + (cd $$subdir && $(MAKE) $$target) \ ## This trick allows "-k" to keep its natural meaning when running a ## recursive rule. || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index cc21db2a..9dc69a7a 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -55,24 +55,26 @@ DVIPS = dvips install-info-am: $(INFO_DEPS) $(NORMAL_INSTALL) $(mkinstalldirs) $(infodir) - for file in $(INFO_DEPS); do \ + @for file in $(INFO_DEPS); do \ ## We use these strange circumlocutions because we want the "ifile" to ## be relative, for the install. for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $(srcdir)/$$ifile; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \ $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \ else : ; fi; \ done; \ done $(POST_INSTALL) ## Only run this code if install-info actually exists. - if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ + @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ ## Run `:' after install-info in case install-info fails. We really ## don't care about failures here, because they can be spurious. For ## instance if you don't have a dir file, install-info will fail. I ## think instead it should create a new dir file for you. This bug ## causes the `make distcheck' target to fail reliably. + echo "install-info --info-dir=$(infodir) $(infodir)/$$file";\ install-info --info-dir=$(infodir) $(infodir)/$$file; :;\ done; \ else : ; fi diff --git a/libs.am b/libs.am index a5a449a9..b5abb0cc 100644 --- a/libs.am +++ b/libs.am @@ -22,6 +22,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## a syntax error in sh. list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ else :; fi; \ done @@ -31,9 +32,10 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. $(POST_INSTALL) - list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ + @list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. + echo "$(RANLIB) $(@DIR@dir)/$$p"; \ $(RANLIB) $(@DIR@dir)/$$p; \ else :; fi; \ done diff --git a/lisp.am b/lisp.am index af1a0bb3..160dfdfa 100644 --- a/lisp.am +++ b/lisp.am @@ -20,10 +20,12 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_LISP)"; for p in $$list; do \ + @list="$(@DIR@_LISP)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ + echo "$(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \ $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \ else : ; fi; \ done diff --git a/ltlibs.am b/ltlibs.am index 12996e35..be0c553a 100644 --- a/ltlibs.am +++ b/ltlibs.am @@ -20,10 +20,11 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_PROGRAMS)"; for p in $$list; do \ + @list="$(@DIR@_PROGRAMS)"; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. + echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/$$p; \ else :; fi; \ done diff --git a/m4/Makefile.in b/m4/Makefile.in index 4790e1c3..d037c58b 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -37,7 +37,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ PERL = @PERL@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 @@ -55,9 +58,6 @@ DATA = $(m4data_DATA) DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -65,10 +65,10 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --gnits m4/Makefile -m4/Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -76,10 +76,12 @@ m4/Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES install-m4dataDATA: $(m4data_DATA) $(NORMAL_INSTALL) $(mkinstalldirs) $(m4datadir) - list="$(m4data_DATA)"; for p in $$list; do \ + @list="$(m4data_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(m4datadir)/$$p"; \ $(INSTALL_DATA) $$p $(m4datadir)/$$p; \ fi; fi; \ done diff --git a/progs.am b/progs.am index 28c0a574..6b4dc22b 100644 --- a/progs.am +++ b/progs.am @@ -20,13 +20,14 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_PROGRAMS)"; for p in $$list; do \ + @list="$(@DIR@_PROGRAMS)"; for p in $$list; do \ if test -f $$p; then \ ## It is harmless to unconditionally use $(LIBTOOL) here because it ## will be null in non-libtoolized packages, and even if it is set to ## a real libtool, its behaviour is identical to normal INSTALL_PROGRAM. ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. + echo "@LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done diff --git a/scripts.am b/scripts.am index b4d71de7..8696ed8c 100644 --- a/scripts.am +++ b/scripts.am @@ -20,12 +20,13 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - list="$(@DIR@_SCRIPTS)"; for p in $$list; do \ + @list="$(@DIR@_SCRIPTS)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else if test -f $(srcdir)/$$p; then \ - $(INSTALL_SCRIPT) $(srcdir)/$$p \ - $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo "$(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; fi; \ done diff --git a/subdirs.am b/subdirs.am index ed0da37f..5b7571de 100644 --- a/subdirs.am +++ b/subdirs.am @@ -29,9 +29,10 @@ installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ check-recursive installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - for subdir in $(SUBDIRS); do \ + @for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ - (cd $$subdir && $(MAKE) $$target) \ + echo "Making $$target in $$subdir"; \ + (cd $$subdir && $(MAKE) $$target) \ ## This trick allows "-k" to keep its natural meaning when running a ## recursive rule. || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ diff --git a/tests/Makefile.in b/tests/Makefile.in index f400fe8a..5266ae23 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -37,7 +37,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ PERL = @PERL@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnits @@ -58,7 +61,8 @@ confsub.test primary.test primary2.test depend2.test spell3.test \ comment2.test vpath.test symlink.test discover.test acinclude.test req.test \ acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test \ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test colon2.test \ -colon3.test remake.test output.test output2.test remake2.test +colon3.test remake.test output.test output2.test remake2.test output3.test \ +output4.test colneq2.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -66,9 +70,6 @@ CONFIG_CLEAN_FILES = DIST_COMMON = ChangeLog Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -76,10 +77,10 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --gnits tests/Makefile -tests/Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/texinfos.am b/texinfos.am index cc21db2a..9dc69a7a 100644 --- a/texinfos.am +++ b/texinfos.am @@ -55,24 +55,26 @@ DVIPS = dvips install-info-am: $(INFO_DEPS) $(NORMAL_INSTALL) $(mkinstalldirs) $(infodir) - for file in $(INFO_DEPS); do \ + @for file in $(INFO_DEPS); do \ ## We use these strange circumlocutions because we want the "ifile" to ## be relative, for the install. for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $(srcdir)/$$ifile; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \ $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \ else : ; fi; \ done; \ done $(POST_INSTALL) ## Only run this code if install-info actually exists. - if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ + @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ ## Run `:' after install-info in case install-info fails. We really ## don't care about failures here, because they can be spurious. For ## instance if you don't have a dir file, install-info will fail. I ## think instead it should create a new dir file for you. This bug ## causes the `make distcheck' target to fail reliably. + echo "install-info --info-dir=$(infodir) $(infodir)/$$file";\ install-info --info-dir=$(infodir) $(infodir)/$$file; :;\ done; \ else : ; fi -- 2.43.5