Define per-directory Makefiles with custom "install" rules for those

directories that supply things to be installed.

diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index c53b2e1a48d14ba3b07572e76345a971d9f654d4..a222e2a6bad82f1afbb3a7554c6e95c24f1a034c 100644 (file)
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.15 2000/12/19 20:49:54 cph Exp $
+# $Id: Makefile.in,v 1.16 2000/12/21 18:11:54 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -58,16 +58,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 SUBDIRS = 6001 compiler cref edwin imail microcode \
          rcs runtime runtime-check sf sos win32
 
-AUXDIR = $(libdir)/mit-scheme
-EDDIR = $(AUXDIR)/edwin
+AUXDIR = @AUXDIR@
+EDETC = $(AUXDIR)/edwin/etc
 
-RUNOPTS = chrsyn cpress format gdbm hashtb krypt mime-codec numint optiondb \
-         ordvec process rbtree regexp rgxcmp syncproc wttree ystep
-RODIR = $(AUXDIR)/options
-
-EDOPTS = eystep manual midas nntp pasmod print pwedit pwparse snr sort \
-        techinfo telnet tximod verilog vhdl webster
-EODIR = $(EDDIR)/autoload
 
 all:
        ( cd microcode && $(MAKE) all )
@@ -81,53 +74,17 @@ tags TAGS:
        $(srcdir)/Tags.sh $(SUBDIRS)
 
 install:
-       $(mkinstalldirs) $(DESTDIR)
-       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)
-       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC
-       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/edwin
-       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/runtime
-       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/imail
-       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/sos
-       $(mkinstalldirs) $(DESTDIR)$(EDDIR)
-       $(mkinstalldirs) $(DESTDIR)$(EDDIR)/etc
-       $(mkinstalldirs) $(DESTDIR)$(EODIR)
-       $(mkinstalldirs) $(DESTDIR)$(RODIR)
-
-       ( cd microcode; $(MAKE) $@ )
+       @for SUBDIR in microcode runtime sos edwin imail; do \
+           echo "Making $@ in $${SUBDIR}";\
+           ( cd $${SUBDIR}; $(MAKE) $@ ) || exit 1;\
+       done
 
+       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)
        $(INSTALL_DATA) $(srcdir)/lib/optiondb.scm $(DESTDIR)$(AUXDIR)/.
        $(INSTALL_DATA) $(srcdir)/lib/*.com $(DESTDIR)$(AUXDIR)/.
 
-       $(INSTALL_DATA) $(srcdir)/etc/TUTORIAL $(DESTDIR)$(EDDIR)/etc/.
-       $(INSTALL_DATA) $(srcdir)/etc/mime.types $(DESTDIR)$(EDDIR)/etc/.
-
-       $(INSTALL_DATA) runtime/*.bci $(DESTDIR)$(AUXDIR)/SRC/runtime/.
-       $(INSTALL_DATA) edwin/*.bci $(DESTDIR)$(AUXDIR)/SRC/edwin/.
-
-       @for FN in $(RUNOPTS); do \
-           echo "$(INSTALL_DATA) runtime/$${FN}.com $(DESTDIR)$(RODIR)/.";\
-           $(INSTALL_DATA) runtime/$${FN}.com $(DESTDIR)$(RODIR)/.;\
-           echo "( cd $(DESTDIR)$(RODIR); $(LN_S) ../SRC/runtime/$${FN}.bci . )";\
-           ( cd $(DESTDIR)$(RODIR); $(LN_S) ../SRC/runtime/$${FN}.bci . );\
-       done
-
-       @for FN in $(EDOPTS); do \
-           echo "$(INSTALL_DATA) edwin/$${FN}.com $(DESTDIR)$(EODIR)/.";\
-           $(INSTALL_DATA) edwin/$${FN}.com $(DESTDIR)$(EODIR)/.;\
-           echo "( cd $(DESTDIR)$(EODIR); $(LN_S) ../../SRC/edwin/$${FN}.bci . )";\
-           ( cd $(DESTDIR)$(EODIR); $(LN_S) ../../SRC/edwin/$${FN}.bci . );\
-       done
-
-       $(INSTALL_DATA) sos/*.com $(DESTDIR)$(AUXDIR)/sos/.
-       $(INSTALL_DATA) sos/*.bci $(DESTDIR)$(AUXDIR)/sos/.
-       $(INSTALL_DATA) sos/sos.bco $(DESTDIR)$(AUXDIR)/sos/.
-       $(INSTALL_DATA) sos/sos.bld $(DESTDIR)$(AUXDIR)/sos/.
-       $(INSTALL_DATA) $(srcdir)/sos/load.scm $(DESTDIR)$(AUXDIR)/sos/.
-
-       $(INSTALL_DATA) imail/*.com $(DESTDIR)$(AUXDIR)/imail/.
-       $(INSTALL_DATA) imail/*.bci $(DESTDIR)$(AUXDIR)/imail/.
-       $(INSTALL_DATA) imail/imail.bco $(DESTDIR)$(AUXDIR)/imail/.
-       $(INSTALL_DATA) imail/imail.bld $(DESTDIR)$(AUXDIR)/imail/.
-       $(INSTALL_DATA) $(srcdir)/imail/load.scm $(DESTDIR)$(AUXDIR)/imail/.
+       $(mkinstalldirs) $(DESTDIR)$(EDETC)
+       $(INSTALL_DATA) $(srcdir)/etc/TUTORIAL $(DESTDIR)$(EDETC)/.
+       $(INSTALL_DATA) $(srcdir)/etc/mime.types $(DESTDIR)$(EDETC)/.
 
 .PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install

diff --git a/v7/src/configure.in b/v7/src/configure.in
index 6c3b158379a08f9ad728b896047e4b9b2fe8d178..19c226802ab3facd44ef1365bd9eecfe59887e6c 100644 (file)
--- a/v7/src/configure.in
+++ b/v7/src/configure.in
@@ -16,12 +16,15 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION([$Id: configure.in,v 1.1 2000/12/08 17:47:19 cph Exp $])
+AC_REVISION([$Id: configure.in,v 1.2 2000/12/21 18:11:30 cph Exp $])
 AC_INIT(microcode/boot.c)
 
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+AUXDIR=${libdir}/mit-scheme
+AC_SUBST(AUXDIR)
+
 AC_CONFIG_SUBDIRS(microcode compiler)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile runtime/Makefile sos/Makefile edwin/Makefile imail/Makefile)

diff --git a/v7/src/edwin/Makefile.in b/v7/src/edwin/Makefile.in
new file mode 100644 (file)
index 0000000..952e870
--- /dev/null
+++ b/v7/src/edwin/Makefile.in
@@ -0,0 +1,91 @@
+# $Id: Makefile.in,v 1.1 2000/12/21 18:12:15 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.
+
+# Standard Makefile for Scheme subsystem directories.
+# This makefile supports some utilities for Scheme subsystems.
+# Tools to rebuild these subsystems are written in Scheme and do not
+# use `make'.
+
+# **** BEGIN BOILERPLATE ****
+
+SHELL = @SHELL@
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+top_builddir = .
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+LN_S = @LN_S@
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+# **** END BOILERPLATE ****
+
+AUXDIR = @AUXDIR@
+EDDIR = $(AUXDIR)/edwin
+EODIR = $(EDDIR)/autoload
+EDOPTS = eystep manual midas nntp pasmod print pwedit pwparse snr sort \
+        techinfo telnet tximod verilog vhdl webster
+
+all:
+       echo "No ALL action"
+
+mostlyclean clean distclean maintainer-clean:
+       ./Clean.sh $@
+
+tags TAGS:
+       ./Tags.sh
+
+install:
+       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/edwin
+       $(mkinstalldirs) $(DESTDIR)$(EDDIR)
+       $(mkinstalldirs) $(DESTDIR)$(EODIR)
+       $(INSTALL_DATA) *.bci $(DESTDIR)$(AUXDIR)/SRC/edwin/.
+
+       @for FN in $(EDOPTS); do \
+           echo "$(INSTALL_DATA) $${FN}.com $(DESTDIR)$(EODIR)/.";\
+           $(INSTALL_DATA) $${FN}.com $(DESTDIR)$(EODIR)/.;\
+           echo "( cd $(DESTDIR)$(EODIR); $(LN_S) ../../SRC/edwin/$${FN}.bci . )";\
+           ( cd $(DESTDIR)$(EODIR); $(LN_S) ../../SRC/edwin/$${FN}.bci . );\
+       done
+
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install

diff --git a/v7/src/etc/Setup.sh b/v7/src/etc/Setup.sh
index 5b3e08aa83713026eada24469ebf766cd812c1fe..239c141930d3f2aae0105ed1db519ebecc4023d3 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.5 2000/12/08 18:04:13 cph Exp $
+# $Id: Setup.sh,v 1.6 2000/12/21 18:12:01 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -28,7 +28,9 @@ fi
 
 . ../etc/functions.sh
 
-maybe_link Makefile ../Makefile.std
+if [ ! -f Makefile.in ]; then
+    maybe_link Makefile ../Makefile.std
+fi
 for FN in Clean.sh Stage.sh Tags.sh; do
     maybe_link ${FN} ../etc/${FN}
 done

diff --git a/v7/src/imail/Makefile.in b/v7/src/imail/Makefile.in
new file mode 100644 (file)
index 0000000..a1ca977
--- /dev/null
+++ b/v7/src/imail/Makefile.in
@@ -0,0 +1,83 @@
+# $Id: Makefile.in,v 1.1 2000/12/21 18:12:20 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.
+
+# Standard Makefile for Scheme subsystem directories.
+# This makefile supports some utilities for Scheme subsystems.
+# Tools to rebuild these subsystems are written in Scheme and do not
+# use `make'.
+
+# **** BEGIN BOILERPLATE ****
+
+SHELL = @SHELL@
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+top_builddir = .
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+LN_S = @LN_S@
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+# **** END BOILERPLATE ****
+
+AUXDIR = @AUXDIR@
+IMAIL_DIR = $(AUXDIR)/imail
+
+all:
+       echo "No ALL action"
+
+mostlyclean clean distclean maintainer-clean:
+       ./Clean.sh $@
+
+tags TAGS:
+       ./Tags.sh
+
+install:
+       $(mkinstalldirs) $(DESTDIR)$(IMAIL_DIR)
+       $(INSTALL_DATA) *.com $(DESTDIR)$(IMAIL_DIR)/.
+       $(INSTALL_DATA) *.bci $(DESTDIR)$(IMAIL_DIR)/.
+       $(INSTALL_DATA) imail.bco $(DESTDIR)$(IMAIL_DIR)/.
+       $(INSTALL_DATA) imail.bld $(DESTDIR)$(IMAIL_DIR)/.
+       $(INSTALL_DATA) $(srcdir)/load.scm $(DESTDIR)$(IMAIL_DIR)/.
+
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install

diff --git a/v7/src/runtime/Makefile.in b/v7/src/runtime/Makefile.in
new file mode 100644 (file)
index 0000000..fec17d2
--- /dev/null
+++ b/v7/src/runtime/Makefile.in
@@ -0,0 +1,89 @@
+# $Id: Makefile.in,v 1.1 2000/12/21 18:11:43 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.
+
+# Standard Makefile for Scheme subsystem directories.
+# This makefile supports some utilities for Scheme subsystems.
+# Tools to rebuild these subsystems are written in Scheme and do not
+# use `make'.
+
+# **** BEGIN BOILERPLATE ****
+
+SHELL = @SHELL@
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+top_builddir = .
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+LN_S = @LN_S@
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+# **** END BOILERPLATE ****
+
+AUXDIR = @AUXDIR@
+RODIR = $(AUXDIR)/options
+RUNOPTS = chrsyn cpress format gdbm hashtb krypt mime-codec numint optiondb \
+         ordvec process rbtree regexp rgxcmp syncproc wttree ystep
+
+all:
+       echo "No ALL action"
+
+mostlyclean clean distclean maintainer-clean:
+       ./Clean.sh $@
+
+tags TAGS:
+       ./Tags.sh
+
+install:
+       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/runtime
+       $(INSTALL_DATA) *.bci $(DESTDIR)$(AUXDIR)/SRC/runtime/.
+
+       $(mkinstalldirs) $(DESTDIR)$(RODIR)
+       @for FN in $(RUNOPTS); do \
+           echo "$(INSTALL_DATA) $${FN}.com $(DESTDIR)$(RODIR)/.";\
+           $(INSTALL_DATA) $${FN}.com $(DESTDIR)$(RODIR)/.;\
+           echo "( cd $(DESTDIR)$(RODIR); $(LN_S) ../SRC/runtime/$${FN}.bci . )";\
+           ( cd $(DESTDIR)$(RODIR); $(LN_S) ../SRC/runtime/$${FN}.bci . );\
+       done
+
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install

diff --git a/v7/src/sos/Makefile.in b/v7/src/sos/Makefile.in
new file mode 100644 (file)
index 0000000..54790a2
--- /dev/null
+++ b/v7/src/sos/Makefile.in
@@ -0,0 +1,83 @@
+# $Id: Makefile.in,v 1.1 2000/12/21 18:12:07 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.
+
+# Standard Makefile for Scheme subsystem directories.
+# This makefile supports some utilities for Scheme subsystems.
+# Tools to rebuild these subsystems are written in Scheme and do not
+# use `make'.
+
+# **** BEGIN BOILERPLATE ****
+
+SHELL = @SHELL@
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+top_builddir = .
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+LN_S = @LN_S@
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+# **** END BOILERPLATE ****
+
+AUXDIR = @AUXDIR@
+SOS_DIR = $(AUXDIR)/sos
+
+all:
+       echo "No ALL action"
+
+mostlyclean clean distclean maintainer-clean:
+       ./Clean.sh $@
+
+tags TAGS:
+       ./Tags.sh
+
+install:
+       $(mkinstalldirs) $(DESTDIR)$(SOS_DIR)
+       $(INSTALL_DATA) *.com $(DESTDIR)$(SOS_DIR)/.
+       $(INSTALL_DATA) *.bci $(DESTDIR)$(SOS_DIR)/.
+       $(INSTALL_DATA) sos.bco $(DESTDIR)$(SOS_DIR)/.
+       $(INSTALL_DATA) sos.bld $(DESTDIR)$(SOS_DIR)/.
+       $(INSTALL_DATA) $(srcdir)/load.scm $(DESTDIR)$(SOS_DIR)/.
+
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install