Use autoconf for top-level Makefile.

diff --git a/v7/src/Setup.sh b/v7/src/Setup.sh
index caf366b771c57d3e653e263fc6760faf0362eebc..0a770b9c91bf0382d65b54234059c0441de41c78 100755 (executable)
--- a/v7/src/Setup.sh
+++ b/v7/src/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.4 2000/12/08 17:56:34 cph Exp $
+# $Id: Setup.sh,v 1.5 2000/12/08 18:04:12 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -26,21 +26,7 @@ if [ ! -x configure ]; then
     autoconf
 fi
 
-maybe_mkdir ()
-{
-    if [ ! -e ${1} ]; then
-       echo "mkdir ${1}"
-       mkdir ${1}
-    fi
-}
-
-maybe_link ()
-{
-    if [ ! -L ${1} ]; then
-       echo "ln -s ${2} ${1}"
-       ln -s ${2} ${1}
-    fi
-}
+. etc/functions.sh
 
 # lib
 maybe_mkdir lib

diff --git a/v7/src/compiler/Setup.sh b/v7/src/compiler/Setup.sh
index 982cee9533c1cbcec1a78babb267ac2714dc17c2..a0170dfdda0d076c2d1ac9d05c59505617533936 100755 (executable)
--- a/v7/src/compiler/Setup.sh
+++ b/v7/src/compiler/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.2 2000/12/08 06:09:03 cph Exp $
+# $Id: Setup.sh,v 1.3 2000/12/08 18:04:12 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -26,15 +26,9 @@ if [ $# -ne 0 ]; then
     exit 1
 fi
 
-../etc/Setup.sh
+. ../etc/functions.sh
 
-maybe_link ()
-{
-    if [ ! -e ${1} ]; then
-       echo "ln -s ${2} ${1}"
-       ln -s ${2} ${1}
-    fi
-}
+../etc/Setup.sh
 
 for N in 1 2 3; do
     maybe_link machines/vax/dinstr${N}.scm instr${N}.scm

diff --git a/v7/src/etc/Setup.sh b/v7/src/etc/Setup.sh
index 93c8cc5c95eb297b61846a2850e193494940abff..5b3e08aa83713026eada24469ebf766cd812c1fe 100755 (executable)
--- a/v7/src/etc/Setup.sh
+++ b/v7/src/etc/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.4 2000/12/08 06:12:52 cph Exp $
+# $Id: Setup.sh,v 1.5 2000/12/08 18:04:13 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -26,13 +26,7 @@ if [ $# -ne 0 ]; then
     exit 1
 fi
 
-maybe_link ()
-{
-    if [ ! -e ${1} ]; then
-       echo "ln -s ${2} ${1}"
-       ln -s ${2} ${1}
-    fi
-}
+. ../etc/functions.sh
 
 maybe_link Makefile ../Makefile.std
 for FN in Clean.sh Stage.sh Tags.sh; do

diff --git a/v7/src/etc/functions.sh b/v7/src/etc/functions.sh
new file mode 100644 (file)
index 0000000..131718b
--- /dev/null
+++ b/v7/src/etc/functions.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $Id: functions.sh,v 1.1 2000/12/08 18:04:13 cph Exp $
+#
+# Copyright (c) 2000 Massachusetts Institute of Technology
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Functions for shell scripts.
+
+maybe_mkdir ()
+{
+    if [ ! -e ${1} ]; then
+       echo "mkdir ${1}"
+       mkdir ${1}
+    fi
+}
+
+maybe_link ()
+{
+    if [ ! -e ${1} ] && [ ! -L ${1} ]; then
+       echo "ln -s ${2} ${1}"
+       ln -s ${2} ${1}
+    fi
+}

diff --git a/v7/src/microcode/Setup.sh b/v7/src/microcode/Setup.sh
index 76a81d391dd7723764c012f7055aca87715ec280..62cf04575b46975acd7ffe201f48c527f2901d20 100755 (executable)
--- a/v7/src/microcode/Setup.sh
+++ b/v7/src/microcode/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: Setup.sh,v 1.3 2000/12/08 17:53:58 cph Exp $
+# $Id: Setup.sh,v 1.4 2000/12/08 18:08:02 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -29,6 +29,7 @@ if [ ! -x configure ]; then
     echo "autoconf"
     autoconf
 fi
-makegen/makeinit.sh
-make setup
-make distclean
+( cd cmpauxmd && $(MAKE) )
+if [ ! -f Makefile.in ]; then
+    makegen/makeinit.sh
+fi

diff --git a/v7/src/runtime-check/Setup.sh b/v7/src/runtime-check/Setup.sh
index 5925e77921719b436cfc34e224637aadc39b8909..f5dd37578880e87fc36921978ae012fdf5a808ab 100755 (executable)
--- a/v7/src/runtime-check/Setup.sh
+++ b/v7/src/runtime-check/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.2 2000/12/08 06:13:56 cph Exp $
+# $Id: Setup.sh,v 1.3 2000/12/08 18:04:13 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -26,15 +26,9 @@ if [ $# -ne 0 ]; then
     exit 1
 fi
 
-../etc/Setup.sh
+. ../etc/functions.sh
 
-maybe_link ()
-{
-    if [ ! -L ${1} ]; then
-       echo "ln -s ${2} ${1}"
-       ln -s ${2} ${1}
-    fi
-}
+../etc/Setup.sh
 
 for FNS in `cd ../runtime; ls *.scm`; do
     FN="`basename ${FNS} .scm`.bin"