plugin Makefile.ams, configure.acs: Accommodate LIAR/C.

Generate lists of Scheme source and binary files depending on the
host's compiled code type.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 163c6a262b882af24938ab755aefb22844c4e1a6..0cd08544c42d91f57aa31fa0a32207d40b485422 100644 (file)
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -27,17 +27,18 @@ EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 scmlibdir = @MIT_SCHEME_LIBDIR@
-scmlib_blowfishdir = $(scmlibdir)blowfish
+scmlib_subdir = $(scmlibdir)blowfish
 
 scmlib_LTLIBRARIES = blowfish-shim.la
 scmlib_DATA = blowfish-types.bin blowfish-const.bin
 
-sources = blowfish.scm
+sources = @MIT_SCHEME_SCMs@
 cdecls = blowfish.cdecl
 
-scmlib_blowfish_DATA = $(sources)
-scmlib_blowfish_DATA += blowfish.bin blowfish.bci blowfish.com
-scmlib_blowfish_DATA += make.scm blowfish-@MIT_SCHEME_OS_SUFFIX@.pkd
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
+scmlib_sub_DATA = $(sources) $(binaries)
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 
 #info_TEXINFOS = mit-scheme-blowfish.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -45,6 +46,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 # Set these to the defaults used by Scheme.
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
+dvidir = $(libdir)/mit-scheme/doc
+pdfdir = $(libdir)/mit-scheme/doc
 
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
@@ -69,10 +72,7 @@ blowfish-const.bin: blowfish-const.scm
 blowfish-const.scm: blowfish-const
        ./blowfish-const
 
-blowfish.bin: stamp-scheme
-blowfish.bci: stamp-scheme
-blowfish.com: stamp-scheme
-blowfish-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) blowfish.pkg
        touch stamp-scheme
        if ! echo '(load "compile.scm")' \
@@ -82,6 +82,7 @@ stamp-scheme: stamp-shim $(sources) blowfish.pkg
 CLEANFILES = blowfish-const* blowfish-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-shim stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = blowfish-check.sh
 CLEANFILES += test
@@ -108,8 +109,8 @@ install-data-hook:
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
-       [ -d "$(DESTDIR)$(scmlib_blowfishdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_blowfishdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
 #      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
 #      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
 #           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 2c70000bad232af3769ac3c68f9f419eac62a339..74e7fb7ae38dbfa4069185b7f8d44814e8857304 100644 (file)
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -100,12 +100,46 @@ MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
                         echo "           (system-library-pathname" ;\
                         echo '            "mit-scheme.h"))))' ) \
                       | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="blowfish-${os_suffix}.pkd"
+
+for f in blowfish; do
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index 8186c85c1ba5b7469f54da0315530ae55bd3b9c8..0ca01bc1eb5c9f3d0bc5082c23372c0cfa510af7 100644 (file)
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -27,17 +27,18 @@ EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 scmlibdir = @MIT_SCHEME_LIBDIR@
-scmlib_gdbmdir = $(scmlibdir)gdbm
+scmlib_subdir = $(scmlibdir)gdbm
 
 scmlib_LTLIBRARIES = gdbm-shim.la
 scmlib_DATA = gdbm-types.bin gdbm-const.bin
 
-sources = gdbm.scm
+sources = @MIT_SCHEME_SCMs@
 cdecls = gdbm.cdecl
 
-scmlib_gdbm_DATA = $(sources)
-scmlib_gdbm_DATA += gdbm.bin gdbm.bci gdbm.com
-scmlib_gdbm_DATA += make.scm gdbm-@MIT_SCHEME_OS_SUFFIX@.pkd
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
+scmlib_sub_DATA = $(sources) $(binaries)
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 
 #info_TEXINFOS = mit-scheme-gdbm.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -45,6 +46,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 # Set these to the defaults used by Scheme.
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
+dvidir = $(libdir)/mit-scheme/doc
+pdfdir = $(libdir)/mit-scheme/doc
 
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
@@ -69,19 +72,17 @@ gdbm-const.bin: gdbm-const.scm
 gdbm-const.scm: gdbm-const
        ./gdbm-const
 
-gdbm.bin: stamp-scheme
-gdbm.bci: stamp-scheme
-gdbm.com: stamp-scheme
-gdbm-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) gdbm.pkg
        touch stamp-scheme
        if ! echo '(load "compile.scm")' \
             | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode; then \
-         rm stamp-scheme; exit 1; fi
+           rm stamp-scheme; exit 1; fi
 
 CLEANFILES = gdbm-const* gdbm-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-shim stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = gdbm-check.sh
 CLEANFILES += gdbm-check.db
@@ -93,8 +94,8 @@ all_sources = $(sources) gdbm-adapter.c
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) gdbm.pkg
-EXTRA_DIST += compile.scm gdbm-check.scm gdbm-check.sh
+EXTRA_DIST += $(all_sources) $(cdecls) compile.scm gdbm.pkg
+EXTRA_DIST += gdbm-check.scm gdbm-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
@@ -108,8 +109,8 @@ install-data-hook:
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
-       [ -d "$(DESTDIR)$(scmlib_gdbmdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_gdbmdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
 #      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
 #      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
 #           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac
index 7e22a055333e17d106a8fea62a741b675acf1fc8..8486844a9d8c9b6d385e1b0bcf00693439c244c3 100644 (file)
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -55,12 +55,46 @@ MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
                         echo "           (system-library-pathname" ;\
                         echo '            "mit-scheme.h"))))' ) \
                       | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="gdbm-${os_suffix}.pkd"
+
+for f in gdbm; do
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am
index 50dae984908bd4adbd05061ca9019033ef97947c..f28a329a793b0eb8a741cf525e61d250e819494b 100644 (file)
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@ -27,17 +27,18 @@ EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 scmlibdir = @MIT_SCHEME_LIBDIR@
-scmlib_mcryptdir = $(scmlibdir)mcrypt
+scmlib_subdir = $(scmlibdir)mcrypt
 
 scmlib_LTLIBRARIES = mcrypt-shim.la
 scmlib_DATA = mcrypt-types.bin mcrypt-const.bin
 
-sources = mcrypt.scm
+sources = @MIT_SCHEME_SCMs@
 cdecls = mcrypt.cdecl
 
-scmlib_mcrypt_DATA = $(sources)
-scmlib_mcrypt_DATA += mcrypt.bin mcrypt.bci mcrypt.com
-scmlib_mcrypt_DATA += make.scm mcrypt-@MIT_SCHEME_OS_SUFFIX@.pkd
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
+scmlib_sub_DATA = $(sources) $(binaries)
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 
 #info_TEXINFOS = mit-scheme-mcrypt.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -45,6 +46,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 # Set these to the defaults used by Scheme.
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
+dvidir = $(libdir)/mit-scheme/doc
+pdfdir = $(libdir)/mit-scheme/doc
 
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
@@ -69,10 +72,7 @@ mcrypt-const.bin: mcrypt-const.scm
 mcrypt-const.scm: mcrypt-const
        ./mcrypt-const
 
-mcrypt.bin: stamp-scheme
-mcrypt.bci: stamp-scheme
-mcrypt.com: stamp-scheme
-mcrypt-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) mcrypt.pkg
        touch stamp-scheme
        if ! echo '(load "compile.scm")' \
@@ -82,6 +82,7 @@ stamp-scheme: stamp-shim $(sources) mcrypt.pkg
 CLEANFILES = mcrypt-const* mcrypt-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-shim stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = mcrypt-check.sh
 CLEANFILES += encrypted decrypted
@@ -108,8 +109,8 @@ install-data-hook:
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
-       [ -d "$(DESTDIR)$(scmlib_mcryptdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_mcryptdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
 #      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
 #      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
 #           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 11b25dce6047d135da93e4bcc3e06b31b0ae7776..395fe15f0b72bc548d3041d0257904635c4e9c7e 100644 (file)
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -85,12 +85,46 @@ MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
                         echo "           (system-library-pathname" ;\
                         echo '            "mit-scheme.h"))))' ) \
                       | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="mcrypt-${os_suffix}.pkd"
+
+for f in mcrypt; do
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/md5/Makefile.am b/src/md5/Makefile.am
index 2d07190285ed1aaf319da1220f9bda2e46f15c37..40264b7fb169b5c010fab62d3730e5d1926dc246 100644 (file)
--- a/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@ -27,17 +27,18 @@ EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 scmlibdir = @MIT_SCHEME_LIBDIR@
-scmlib_md5dir = $(scmlibdir)md5
+scmlib_subdir = $(scmlibdir)md5
 
 scmlib_LTLIBRARIES = md5-shim.la
 scmlib_DATA = md5-types.bin md5-const.bin
 
-sources = md5.scm
+sources = @MIT_SCHEME_SCMs@
 cdecls = md5.cdecl
 
-scmlib_md5_DATA = $(sources)
-scmlib_md5_DATA += md5.bin md5.bci md5.com
-scmlib_md5_DATA += make.scm md5-@MIT_SCHEME_OS_SUFFIX@.pkd
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
+scmlib_sub_DATA = $(sources) $(binaries)
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 
 #info_TEXINFOS = mit-scheme-md5.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -45,6 +46,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 # Set these to the defaults used by Scheme.
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
+dvidir = $(libdir)/mit-scheme/doc
+pdfdir = $(libdir)/mit-scheme/doc
 
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
@@ -69,10 +72,7 @@ md5-const.bin: md5-const.scm
 md5-const.scm: md5-const
        ./md5-const
 
-md5.bin: stamp-scheme
-md5.bci: stamp-scheme
-md5.com: stamp-scheme
-md5-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) md5.pkg
        touch stamp-scheme
        if ! echo '(load "compile.scm")' \
@@ -82,6 +82,7 @@ stamp-scheme: stamp-shim $(sources) md5.pkg
 CLEANFILES = md5-const* md5-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-shim stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = md5-check.sh
 CLEANFILES += sample
@@ -108,8 +109,8 @@ install-data-hook:
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
-       [ -d "$(DESTDIR)$(scmlib_md5dir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_md5dir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
 #      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
 #      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
 #           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/md5/configure.ac b/src/md5/configure.ac
index 49e37f2a7a795c5591e36073c3e213fc60bc37a3..a9605303f244d19e637d749ffa9297c33a5a166b 100644 (file)
--- a/src/md5/configure.ac
+++ b/src/md5/configure.ac
@@ -100,12 +100,46 @@ MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
                         echo "           (system-library-pathname" ;\
                         echo '            "mit-scheme.h"))))' ) \
                       | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="md5-${os_suffix}.pkd"
+
+for f in md5; do
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/mhash/Makefile.am b/src/mhash/Makefile.am
index 9ec3ec375afb7d581bcce45571460f78f4037c87..d9637dc6d11c5bf33e50b4cd770ac669de1106f0 100644 (file)
--- a/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@ -27,17 +27,18 @@ EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 scmlibdir = @MIT_SCHEME_LIBDIR@
-scmlib_mhashdir = $(scmlibdir)mhash
+scmlib_subdir = $(scmlibdir)mhash
 
 scmlib_LTLIBRARIES = mhash-shim.la
 scmlib_DATA = mhash-types.bin mhash-const.bin
 
-sources = mhash.scm
+sources = @MIT_SCHEME_SCMs@
 cdecls = mhash.cdecl
 
-scmlib_mhash_DATA = $(sources)
-scmlib_mhash_DATA += mhash.bin mhash.bci mhash.com
-scmlib_mhash_DATA += make.scm mhash-@MIT_SCHEME_OS_SUFFIX@.pkd
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
+scmlib_sub_DATA = $(sources) $(binaries)
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 
 #info_TEXINFOS = mit-scheme-mhash.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -45,6 +46,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 # Set these to the defaults used by Scheme.
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
+dvidir = $(libdir)/mit-scheme/doc
+pdfdir = $(libdir)/mit-scheme/doc
 
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
@@ -69,10 +72,7 @@ mhash-const.bin: mhash-const.scm
 mhash-const.scm: mhash-const
        ./mhash-const
 
-mhash.bin: stamp-scheme
-mhash.bci: stamp-scheme
-mhash.com: stamp-scheme
-mhash-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) mhash.pkg
        touch stamp-scheme
        if ! echo '(load "compile.scm")' \
@@ -82,6 +82,7 @@ stamp-scheme: stamp-shim $(sources) mhash.pkg
 CLEANFILES = mhash-const* mhash-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-shim stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = mhash-check.sh
 CLEANFILES += sample
@@ -108,8 +109,8 @@ install-data-hook:
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
-       [ -d "$(DESTDIR)$(scmlib_mhashdir)" ] \
-       && rmdir "$(DESTDIR)$(scmlib_mhashdir)"
+       [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
+       && rmdir "$(DESTDIR)$(scmlib_subdir)"
 #      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
 #      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
 #           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/mhash/configure.ac b/src/mhash/configure.ac
index 1713259b8d74bf6d706087b518ada070307d896e..7a2dfba57370059be916cccf4922aa55571f11b1 100644 (file)
--- a/src/mhash/configure.ac
+++ b/src/mhash/configure.ac
@@ -82,12 +82,46 @@ MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
                         echo "           (system-library-pathname" ;\
                         echo '            "mit-scheme.h"))))' ) \
                       | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="mhash-${os_suffix}.pkd"
+
+for f in mhash; do
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/x11-screen/Makefile.am b/src/x11-screen/Makefile.am
index 9b607ed7ca56e5614ad1feb65dcd0e8c2c1d626b..d6df77f826527530c2e3710f6c0c22d625575fe4 100644 (file)
--- a/src/x11-screen/Makefile.am
+++ b/src/x11-screen/Makefile.am
@@ -28,13 +28,15 @@ MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 scmlibdir = @MIT_SCHEME_LIBDIR@
 scmlib_subdir = $(scmlibdir)x11-screen
 
-sources = x11-screen.scm # x11-key.scm x11-command.scm
-binaries = x11-screen.bci x11-screen.com
-# binaries += x11-key.bci x11-key.com x11-command.scm.bci x11-command.scm.com
+sources = @MIT_SCHEME_SCMs@
 
-scmlib_sub_DATA = $(sources)
-scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm x11-screen-@MIT_SCHEME_OS_SUFFIX@.pkd
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
+scmlib_sub_DATA = $(sources) $(binaries)
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
+
+#info_TEXINFOS = mit-scheme-x11-screen.texi
+AM_MAKEINFOHTMLFLAGS = --no-split
 
 # Set these to the defaults used by Scheme.
 infodir = $(datarootdir)/info
@@ -42,19 +44,14 @@ htmldir = $(libdir)/mit-scheme/doc
 dvidir = $(libdir)/mit-scheme/doc
 pdfdir = $(libdir)/mit-scheme/doc
 
-#x11-key.bci: stamp-scheme
-#x11-key.com: stamp-scheme
-#x11-command.scm.bci: stamp-scheme
-#x11-command.scm.com: stamp-scheme
-x11-screen.bci: stamp-scheme
-x11-screen.com: stamp-scheme
-x11-screen-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: $(sources) x11-screen.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 
 CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = x11-screen-check.sh
 
@@ -69,8 +66,15 @@ install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
 
+#install-html: install-html-am
+#      echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \
+#      | $(MIT_SCHEME_EXE) --batch-mode
+
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
        [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_subdir)"
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/x11-screen/configure.ac b/src/x11-screen/configure.ac
index a306e920ca2246b599ce9c665d75d66f72d3b3fd..062321c2bb7342eaef04b3ef59832325ea367ed2 100644 (file)
--- a/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@ -37,11 +37,46 @@ AC_PROG_INSTALL
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="x11-screen-${os_suffix}.pkd"
+
+for f in x11-screen; do        # x11-key x11-command
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am
index 7a7d4df235a2cfc6c22bc44c6e2728fa5f4ca3d3..d774c4265b832d04982dadc9e1986fab061adc09 100644 (file)
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@ -32,14 +32,13 @@ scmlib_subdir = $(scmlibdir)x11
 scmlib_LTLIBRARIES = x11-shim.la
 scmlib_DATA = x11-types.bin x11-const.bin
 
-sources = x11base.scm x11color.scm x11graph.scm x11term.scm x11device.scm
-binaries = x11base.bci x11base.com x11color.bci x11color.com
-binaries += x11graph.bci x11graph.com x11term.bci x11term.com
-binaries += x11device.bci x11device.com
+sources = @MIT_SCHEME_SCMs@
 cdecls = x11.cdecl
 
+binaries = @MIT_SCHEME_BINs@ @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@
+
 scmlib_sub_DATA = $(sources) $(binaries)
-scmlib_sub_DATA += make.scm x11-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 
 #info_TEXINFOS = mit-scheme-x11.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -76,17 +75,7 @@ x11-const.bin: x11-const.scm
 x11-const.scm: x11-const
        ./x11-const
 
-x11base.bci: stamp-scheme
-x11base.com: stamp-scheme
-x11color.bci: stamp-scheme
-x11color.com: stamp-scheme
-x11graph.bci: stamp-scheme
-x11graph.com: stamp-scheme
-x11term.bci: stamp-scheme
-x11term.com: stamp-scheme
-x11device.bci: stamp-scheme
-x11device.com: stamp-scheme
-x11-@MIT_SCHEME_OS_SUFFIX@.pkg: stamp-scheme
+@MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) x11.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
@@ -94,6 +83,7 @@ stamp-scheme: stamp-shim $(sources) x11.pkg
 CLEANFILES = x11-const* x11-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 CLEANFILES += stamp-shim stamp-scheme
+CLEANFILES += @MIT_SCHEME_CLEAN@
 
 TESTS = x11-check.sh
 
@@ -112,8 +102,15 @@ install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
 
+#install-html: install-html-am
+#      echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \
+#      | $(MIT_SCHEME_EXE) --batch-mode
+
 uninstall-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
        | $(MIT_SCHEME_EXE) --batch-mode
        [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_subdir)"
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/x11/configure.ac b/src/x11/configure.ac
index 1258ef256f28414e9458b0421e4dfe89f7e362c4..93f9347f28b886dd901229d400a7ced784a3243c 100644 (file)
--- a/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@ -55,12 +55,46 @@ MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
                         echo "           (system-library-pathname" ;\
                         echo '            "mit-scheme.h"))))' ) \
                       | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+
+cc_type=`echo "(display microcode-id/compiled-code-type)" \
+        | ${MIT_SCHEME_EXE} --batch-mode`
+os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+          | ${MIT_SCHEME_EXE} --batch-mode`
+
+MIT_SCHEME_PKD="x11-${os_suffix}.pkd"
+
+for f in x11base x11color x11graph x11term x11device; do
+    MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
+    MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
+    MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bin: stamp-scheme"
+    MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.bci: stamp-scheme"
+    if test "$cc_type" = "c"; then
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
+       MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.so: stamp-scheme"
+    else
+       MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com"
+       MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${f}.com: stamp-scheme"
+    fi
+done
+MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
+${MIT_SCHEME_PKD}: stamp-scheme"
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_SCMs])
+AC_SUBST([MIT_SCHEME_BINs])
+AC_SUBST([MIT_SCHEME_BCIs])
+AC_SUBST([MIT_SCHEME_COMs])
+AC_SUBST([MIT_SCHEME_CLEAN])
+AC_SUBST([MIT_SCHEME_DEPS])
+AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT