From f32d1afbfe26a26b6c96416f9f605a432c6b7a96 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 22 Jun 2007 02:31:22 +0000 Subject: [PATCH] Eliminate the use of the (non-POSIX) make variable $^. Prevent "utabmd.bin" from being a microcode "make all" dependency when configured for liarc. --- v7/src/etc/utilities.scm | 39 +++++++++++++------------ v7/src/microcode/configure.ac | 5 +++- v7/src/microcode/makegen/Makefile.in.in | 25 ++++++++-------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/v7/src/etc/utilities.scm b/v7/src/etc/utilities.scm index a081c5921..afc9afa3a 100644 --- a/v7/src/etc/utilities.scm +++ b/v7/src/etc/utilities.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: utilities.scm,v 1.7 2007/06/15 18:07:28 cph Exp $ +$Id: utilities.scm,v 1.8 2007/06/22 02:31:18 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -72,24 +72,25 @@ USA. (let ((init-root (string-append bundle "-init"))) (write-rule port "compile-liarc-bundle" so-file) (newline port) - (write-rule port - so-file - (string-append init-root ".o") - (files+suffix names ".o")) - (write-command port - (string-append "@" script-dir "/liarc-ld") - "$@" - "$^") + (let ((prereqs + (cons (string-append init-root ".o") + (files+suffix names ".o")))) + (write-rule port so-file prereqs) + (write-command port + (string-append "@" script-dir "/liarc-ld") + "$@" + prereqs)) (newline port) - (write-rule port - (string-append init-root ".c") - (files+suffix names ".c")) - (write-command port - "$(top_srcdir)/etc/c-bundle.sh" - script-dir - "library" - init-root - "$^") + (let ((prereqs (files+suffix names ".c"))) + (write-rule port + (string-append init-root ".c") + prereqs) + (write-command port + "$(top_srcdir)/etc/c-bundle.sh" + script-dir + "library" + init-root + prereqs)) (newline port) (write-rule port "install-liarc-bundle" so-file) (write-command port @@ -97,7 +98,7 @@ USA. "$(DESTDIR)$(AUXDIR)/lib") (write-command port "$(INSTALL_DATA)" - "$^" + so-file "$(DESTDIR)$(AUXDIR)/lib/.") (newline port) (write-rule port diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac index 7c513a0a2..6ff27515b 100644 --- a/v7/src/microcode/configure.ac +++ b/v7/src/microcode/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([MIT/GNU Scheme microcode], [15.1], [bug-mit-scheme@gnu.org], [mit-scheme]) -AC_REVISION([$Id: configure.ac,v 1.50 2007/06/21 06:17:16 riastradh Exp $]) +AC_REVISION([$Id: configure.ac,v 1.51 2007/06/22 02:31:20 cph Exp $]) AC_CONFIG_SRCDIR([boot.c]) AC_CONFIG_HEADERS([config.h]) AC_PROG_MAKE_SET @@ -192,6 +192,7 @@ MODULE_LDFLAGS= LIARC_VARS=/dev/null LIARC_RULES=/dev/null AUX_PROGRAMS= +AUX_DATA=utabmd.bin SYSTEM_BASE_NAME=mit-scheme INSTALL_INCLUDE= @@ -930,6 +931,7 @@ c) LIARC_VARS=liarc-vars LIARC_RULES=liarc-rules AUX_PROGRAMS="gen-nonce extract-liarc-decls" + AUX_DATA= SYSTEM_BASE_NAME=mit-scheme-c INSTALL_INCLUDE=install-include ;; @@ -991,6 +993,7 @@ AC_SUBST([MODULE_LDFLAGS]) AC_SUBST_FILE([LIARC_VARS]) AC_SUBST_FILE([LIARC_RULES]) AC_SUBST([AUX_PROGRAMS]) +AC_SUBST([AUX_DATA]) AC_SUBST([SYSTEM_BASE_NAME]) AC_SUBST([INSTALL_INCLUDE]) AC_SUBST([CCLD]) diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in index fb2974427..e87f9ed59 100644 --- a/v7/src/microcode/makegen/Makefile.in.in +++ b/v7/src/microcode/makegen/Makefile.in.in @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# $Id: Makefile.in.in,v 1.58 2007/06/06 19:42:41 cph Exp $ +# $Id: Makefile.in.in,v 1.59 2007/06/22 02:31:22 cph Exp $ # # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, # 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -120,7 +120,7 @@ MODULE_LIBS = -lc aux_PROGRAMS = @AUX_PROGRAMS@ aux_LIBS = $(MODULE_TARGETS) -aux_DATA = utabmd.bin +aux_DATA = @AUX_DATA@ EXTRA_PROGRAMS = findprim scheme_SOURCES = $(STD_SOURCES) usrdef.c $(LIARC_SOURCES) @@ -142,7 +142,8 @@ ALL_DATA = $(aux_DATA) MOSTLYCLEAN_FILES = *.o usrdef.c compinit.c compinit.h cmpauxmd.s \ $(LIARC_OBJECTS) -CLEAN_FILES = $(ALL_PROGRAMS) $(ALL_LIBS) $(ALL_DATA) $(EXTRA_PROGRAMS) +CLEAN_FILES = $(ALL_PROGRAMS) $(ALL_LIBS) $(ALL_DATA) $(EXTRA_PROGRAMS) \ + utabmd.bin DISTCLEAN_FILES = Makefile config.h config.cache config.log config.status \ cmpauxmd.m4 cmpauxmd.c cmpintmd.h makegen-cc \ @@ -186,34 +187,34 @@ findprim: $(findprim_OBJECTS) $(findprim_DEPENDENCIES) $(LINK) $(findprim_LDFLAGS) $(findprim_OBJECTS) $(findprim_LIBS) gen-nonce: gen-nonce.o - $(LINK) $^ + $(LINK) gen-nonce.o extract-liarc-decls: extract-liarc-decls.o - $(LINK) $^ + $(LINK) extract-liarc-decls.o utabmd.bin: utabmd.scm ./utabmd.sh prbfish.so: prbfish.o - $(LINK_MODULE) $^ $(PRBFISH_LIBS) $(MODULE_LIBS) + $(LINK_MODULE) prbfish.o $(PRBFISH_LIBS) $(MODULE_LIBS) prmd5.so: prmd5.o - $(LINK_MODULE) $^ $(PRMD5_LIBS) $(MODULE_LIBS) + $(LINK_MODULE) prmd5.o $(PRMD5_LIBS) $(MODULE_LIBS) prmhash.so: prmhash.o - $(LINK_MODULE) $^ -lmhash $(MODULE_LIBS) + $(LINK_MODULE) prmhash.o -lmhash $(MODULE_LIBS) prmcrypt.so: prmcrypt.o - $(LINK_MODULE) $^ -lmcrypt -lltdl $(MODULE_LIBS) + $(LINK_MODULE) prmcrypt.o -lmcrypt -lltdl $(MODULE_LIBS) prgdbm.so: prgdbm.o - $(LINK_MODULE) $^ -lgdbm $(MODULE_LIBS) + $(LINK_MODULE) prgdbm.o -lgdbm $(MODULE_LIBS) prdb4.so: prdb4.o - $(LINK_MODULE) $^ -ldb-4 $(MODULE_LIBS) + $(LINK_MODULE) prdb4.o -ldb-4 $(MODULE_LIBS) prpgsql.so: prpgsql.o - $(LINK_MODULE) $^ -lpq $(MODULE_LIBS) + $(LINK_MODULE) prpgsql.o -lpq $(MODULE_LIBS) @MODULE_RULES@ -- 2.25.1