From 85e02c55a9f453aa7d079835cc2645859962512c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 10 Dec 1996 07:31:57 +0000 Subject: [PATCH] updated to automake 1.1l --- Makefile.in | 23 +++++++++++++---------- aclocal.m4 | 2 +- ice-9/Makefile.in | 15 +++++++++------ ice-9/aclocal.m4 | 2 +- qt/Makefile.in | 32 ++++++++++++++++++-------------- qt/aclocal.m4 | 2 +- 6 files changed, 43 insertions(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1880180d4..ad61ab076 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1k from Makefile.am +# Makefile.in generated automatically by automake 1.1l from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,7 +37,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +PACKAGE = @PACKAGE@ existingdirs = @existingdirs@ +VERSION = @VERSION@ SUBDIRS = @existingdirs@ doc @@ -57,9 +60,6 @@ Makefile.in NEWS README TODO aclocal.m4 config.guess config.sub \ configure configure.in install-sh mdate-sh mkinstalldirs -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -67,8 +67,8 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in - cd $(top_srcdir) && automake --foreign Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) + cd $(top_srcdir) && automake --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ @@ -85,10 +85,12 @@ $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) install-aclocalDATA: $(aclocal_DATA) $(NORMAL_INSTALL) $(mkinstalldirs) $(aclocaldir) - list="$(aclocal_DATA)"; for p in $$list; do \ + @list="$(aclocal_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(aclocaldir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(aclocaldir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(aclocaldir)/$$p"; \ $(INSTALL_DATA) $$p $(aclocaldir)/$$p; \ fi; fi; \ done @@ -112,9 +114,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: @@ -161,7 +164,7 @@ distdir: $(DISTFILES) -chmod 755 $(distdir) here=`pwd`; distdir=`cd $(distdir) && pwd` \ && cd $(srcdir) \ - && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --foreign + && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --gnu @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ diff --git a/aclocal.m4 b/aclocal.m4 index ab6c5e5e6..e18720fd8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.1k +dnl aclocal.m4 generated automatically by aclocal 1.1l # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in index b23093177..c8fd1686b 100644 --- a/ice-9/Makefile.in +++ b/ice-9/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1k from Makefile.am +# Makefile.in generated automatically by automake 1.1l from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,6 +37,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +module = @module@ AUTOMAKE_OPTIONS = foreign @@ -54,9 +58,6 @@ DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in aclocal.m4 \ configure configure.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -64,7 +65,7 @@ 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 --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -82,10 +83,12 @@ $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) install-subpkgdataDATA: $(subpkgdata_DATA) $(NORMAL_INSTALL) $(mkinstalldirs) $(subpkgdatadir) - list="$(subpkgdata_DATA)"; for p in $$list; do \ + @list="$(subpkgdata_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(subpkgdatadir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(subpkgdatadir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(subpkgdatadir)/$$p"; \ $(INSTALL_DATA) $$p $(subpkgdatadir)/$$p; \ fi; fi; \ done diff --git a/ice-9/aclocal.m4 b/ice-9/aclocal.m4 index 3036d6424..ace866913 100644 --- a/ice-9/aclocal.m4 +++ b/ice-9/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.1k +dnl aclocal.m4 generated automatically by aclocal 1.1l dnl Usage: AM_INIT_GUILE_MODULE(module-name) diff --git a/qt/Makefile.in b/qt/Makefile.in index 5353000b3..634b72a0e 100644 --- a/qt/Makefile.in +++ b/qt/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1k from Makefile.am +# Makefile.in generated automatically by automake 1.1l from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,17 +37,21 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -host_alias = @host_alias@ host_triplet = @host@ -RANLIB = @RANLIB@ -qtmd_h = @qtmd_h@ +host_alias = @host_alias@ +target_libs = @target_libs@ +VERSION = @VERSION@ +module = @module@ CC = @CC@ qtmds_o = @qtmds_o@ qtmdc_o = @qtmdc_o@ -target_libs = @target_libs@ -qtmds_s = @qtmds_s@ -qtmdc_c = @qtmdc_c@ +RANLIB = @RANLIB@ qtmdb_s = @qtmdb_s@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +qtmdc_c = @qtmdc_c@ +qtmds_s = @qtmds_s@ +PACKAGE = @PACKAGE@ +qtmd_h = @qtmd_h@ AUTOMAKE_OPTIONS = foreign @@ -81,9 +85,6 @@ DIST_COMMON = README ChangeLog INSTALL Makefile.am Makefile.in README \ aclocal.m4 configure configure.in qt.h.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -96,7 +97,7 @@ default: all .SUFFIXES: .SUFFIXES: .c .o -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -127,12 +128,14 @@ install-libLIBRARIES: $(lib_LIBRARIES) $(mkinstalldirs) $(libdir) list="$(lib_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(libdir)/$$p"; \ $(INSTALL_DATA) $$p $(libdir)/$$p; \ else :; fi; \ done $(POST_INSTALL) - list="$(lib_LIBRARIES)"; for p in $$list; do \ + @list="$(lib_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ + echo "$(RANLIB) $(libdir)/$$p"; \ $(RANLIB) $(libdir)/$$p; \ else :; fi; \ done @@ -174,9 +177,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/qt/aclocal.m4 b/qt/aclocal.m4 index 470d957aa..a41f837ad 100644 --- a/qt/aclocal.m4 +++ b/qt/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.1k +dnl aclocal.m4 generated automatically by aclocal 1.1l dnl Usage: AM_INIT_GUILE_MODULE(module-name)