From f9d81b6bcb4bc08d19f11b87a18a89f5176d1b7d Mon Sep 17 00:00:00 2001 From: Mark Galassi Date: Fri, 13 Dec 1996 02:50:04 +0000 Subject: [PATCH] updated the Makefile.in files with the right automake 1.1l --- aclocal.m4 | 2 +- libguile/Makefile.in | 38 +++++++++++++++++++++++--------------- libguile/aclocal.m4 | 2 +- qt/md/Makefile.in | 25 +++++++++++++------------ qt/time/Makefile.in | 25 +++++++++++++------------ 5 files changed, 51 insertions(+), 41 deletions(-) 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/libguile/Makefile.in b/libguile/Makefile.in index ac7579846..94915eae0 100644 --- a/libguile/Makefile.in +++ b/libguile/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 @@ -39,6 +39,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ FD_SETTER = @FD_SETTER@ RANLIB = @RANLIB@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +module = @module@ CC = @CC@ AUTOMAKE_OPTIONS = foreign @@ -120,9 +124,6 @@ acinclude.m4 aclocal.m4 configure configure.in fd.h.in guile-snarf.in \ scmconfig.h.in stamp-h.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -151,7 +152,7 @@ default: all .SUFFIXES: .SUFFIXES: .c .o .x -$(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) @@ -204,12 +205,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 @@ -241,12 +244,13 @@ libguile.a: $(libguile_a_OBJECTS) $(libguile_a_DEPENDENCIES) 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 @@ -258,10 +262,12 @@ uninstall-binSCRIPTS: install-modincludeDATA: $(modinclude_DATA) $(NORMAL_INSTALL) $(mkinstalldirs) $(modincludedir) - list="$(modinclude_DATA)"; for p in $$list; do \ + @list="$(modinclude_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \ else if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(modincludedir)/$$p"; \ $(INSTALL_DATA) $$p $(modincludedir)/$$p; \ fi; fi; \ done @@ -274,7 +280,8 @@ uninstall-modincludeDATA: install-includeHEADERS: $(include_HEADERS) $(NORMAL_INSTALL) $(mkinstalldirs) $(includedir) - list="$(include_HEADERS)"; for p in $$list; do \ + @list="$(include_HEADERS)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \ done @@ -286,7 +293,8 @@ uninstall-includeHEADERS: install-modincludeHEADERS: $(modinclude_HEADERS) $(NORMAL_INSTALL) $(mkinstalldirs) $(modincludedir) - list="$(modinclude_HEADERS)"; for p in $$list; do \ + @list="$(modinclude_HEADERS)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \ done @@ -378,11 +386,11 @@ distclean-depend: maintainer-clean-depend: rm -rf .deps -.deps/%.P: $(srcdir)/%@EXT@ +.deps/%.P: $(srcdir)/%.c @echo "Computing dependencies for $<..." @o='o'; \ -ONLYC test -n "$o" && o='$$o'; \ - $(@MKDEP@) $< | sed "s/^\(.*\)\.o:/\1.$$o \1.l$$o:/" > $@ + test -n "$o" && o='$$o'; \ + $(MKDEP) $< | sed "s/^\(.*\)\.o:/\1.$$o \1.l$$o:/" > $@ info: dvi: check: all diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4 index cce323288..0ddeceb4f 100644 --- a/libguile/aclocal.m4 +++ b/libguile/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 On the NeXT, #including doesn't give you a definition for dnl struct utime, unless you #define _POSIX_SOURCE. diff --git a/qt/md/Makefile.in b/qt/md/Makefile.in index 54bd87068..7e3696610 100644 --- a/qt/md/Makefile.in +++ b/qt/md/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 @@ -63,9 +67,6 @@ CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -73,8 +74,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 --foreign md/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ diff --git a/qt/time/Makefile.in b/qt/time/Makefile.in index 9e28de8b4..74e3865cf 100644 --- a/qt/time/Makefile.in +++ b/qt/time/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 @@ -57,9 +61,6 @@ CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) @@ -67,8 +68,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 --foreign time/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \