plugin Makefile.ams: Fix multi-target rules. Punt install-html.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index f3e45c39f846390e4219f80d92519640d1d1482f..e47953d17a74015ee798fc55f103fd67ed8d72c4 100644 (file)
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -50,10 +50,14 @@ blowfish_shim_la_LDFLAGS = -module -avoid-version -shared
 noinst_PROGRAMS = blowfish-const
 blowfish_const_SOURCES = blowfish-const.c blowfish-shim.h
 
-blowfish-shim.c blowfish-const.c blowfish-types.bin: \
-  blowfish.cdecl blowfish-shim.h
+blowfish-shim.c: stamp-shim
+blowfish-const.c: stamp-shim
+blowfish-types.bin: stamp-shim
+stamp-shim: blowfish.cdecl blowfish-shim.h
+       touch stamp-shim
        echo '(generate-shim "blowfish" "#include \"blowfish-shim.h\"")' \
-       | $(MIT_SCHEME_EXE) --batch-mode
+       | $(MIT_SCHEME_EXE) --batch-mode \
+       || rm stamp-shim
 
 blowfish-const.bin: blowfish-const.scm
        echo '(sf "blowfish-const")' | $(MIT_SCHEME_EXE) --batch-mode
@@ -61,10 +65,15 @@ blowfish-const.bin: blowfish-const.scm
 blowfish-const.scm: blowfish-const
        ./blowfish-const
 
-blowfish.bin blowfish.bci blowfish.com blowfish-@MIT_SCHEME_OS_SUFFIX@.pkd: \
-  blowfish.scm blowfish-const.bin blowfish-types.bin
+blowfish.bin: stamp-scheme
+blowfish.bci: stamp-scheme
+blowfish.com: stamp-scheme
+blowfish-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+stamp-scheme: stamp-shim blowfish.scm
+       touch stamp-scheme
        echo '(load "compile.scm")' \
-       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode
+       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
+       || rm stamp-scheme
 
 CLEANFILES = blowfish-const* blowfish-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
@@ -76,15 +85,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
+#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_blowfishdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_blowfishdir)"
-       [ -d "$(DESTDIR)$(htmldir)" ]                                   \
-       && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
-            | $(MIT_SCHEME_EXE) --batch-mode )
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index 444d6ec662d1c3386cea7b2ae075671d45cd263c..36d0eca966b703e6cc3459be964a055c1ec7ee38 100644 (file)
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -50,9 +50,14 @@ gdbm_shim_la_LDFLAGS = -module -avoid-version -shared
 noinst_PROGRAMS = gdbm-const
 gdbm_const_SOURCES = gdbm-const.c gdbm-shim.h
 
-gdbm-shim.c gdbm-const.c gdbm-types.bin: gdbm.cdecl gdbm-shim.h
+gdbm-shim.c: stamp-shim
+gdbm-const.c: stamp-shim
+gdbm-types.bin: stamp-shim
+stamp-shim: gdbm.cdecl gdbm-shim.h
+       touch stamp-shim
        echo '(generate-shim "gdbm" "#include \"gdbm-shim.h\"")' \
-       | $(MIT_SCHEME_EXE) --batch-mode
+       | $(MIT_SCHEME_EXE) --batch-mode \
+       || rm stamp-shim
 
 gdbm-const.bin: gdbm-const.scm
        echo '(sf "gdbm-const")' | $(MIT_SCHEME_EXE) --batch-mode
@@ -60,10 +65,15 @@ gdbm-const.bin: gdbm-const.scm
 gdbm-const.scm: gdbm-const
        ./gdbm-const
 
-gdbm.bin gdbm.bci gdbm.com gdbm-@MIT_SCHEME_OS_SUFFIX@.pkd: \
-  gdbm.scm gdbm-const.bin gdbm-types.bin
+gdbm.bin: stamp-scheme
+gdbm.bci: stamp-scheme
+gdbm.com: stamp-scheme
+gdbm-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+stamp-scheme: stamp-shim gdbm.scm
+       touch stamp-scheme
        echo '(load "compile.scm")' \
-       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode
+       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
+       || rm stamp-scheme
 
 CLEANFILES = gdbm-const* gdbm-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
@@ -75,15 +85,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
+#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_gdbmdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_gdbmdir)"
-       [ -d "$(DESTDIR)$(htmldir)" ]                                   \
-       && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
-            | $(MIT_SCHEME_EXE) --batch-mode )
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am
index 8e2e61accaa6cd43822b719b368de6ad4dc70341..f04187b3135e429f3b902ee713284dd005da39db 100644 (file)
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@ -50,9 +50,14 @@ mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared
 noinst_PROGRAMS = mcrypt-const
 mcrypt_const_SOURCES = mcrypt-const.c mcrypt-shim.h
 
-mcrypt-shim.c mcrypt-const.c mcrypt-types.bin: mcrypt.cdecl mcrypt-shim.h
+mcrypt-shim.c: stamp-shim
+mcrypt-const.c: stamp-shim
+mcrypt-types.bin: stamp-shim
+stamp-shim: mcrypt.cdecl mcrypt-shim.h
+       touch stamp-shim
        echo '(generate-shim "mcrypt" "#include \"mcrypt-shim.h\"")' \
-       | $(MIT_SCHEME_EXE) --batch-mode
+       | $(MIT_SCHEME_EXE) --batch-mode \
+       || rm stamp-shim
 
 mcrypt-const.bin: mcrypt-const.scm
        echo '(sf "mcrypt-const")' | $(MIT_SCHEME_EXE) --batch-mode
@@ -60,10 +65,15 @@ mcrypt-const.bin: mcrypt-const.scm
 mcrypt-const.scm: mcrypt-const
        ./mcrypt-const
 
-mcrypt.bin mcrypt.bci mcrypt.com mcrypt-@MIT_SCHEME_OS_SUFFIX@.pkd: \
-  mcrypt.scm mcrypt-const.bin mcrypt-types.bin
+mcrypt.bin: stamp-scheme
+mcrypt.bci: stamp-scheme
+mcrypt.com: stamp-scheme
+mcrypt-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+stamp-scheme: stamp-shim mcrypt.scm
+       touch stamp-scheme
        echo '(load "compile.scm")' \
-       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode
+       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
+       || rm stamp-scheme
 
 CLEANFILES = mcrypt-const* mcrypt-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
@@ -75,15 +85,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
+#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_mcryptdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_mcryptdir)"
-       [ -d "$(DESTDIR)$(htmldir)" ]                                   \
-       && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
-            | $(MIT_SCHEME_EXE) --batch-mode )
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/md5/Makefile.am b/src/md5/Makefile.am
index d2e26e9973812f5e7785d074c3486715850e3d3c..c09f56da54214316d9addcf47d6b1ab17243aa33 100644 (file)
--- a/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@ -50,9 +50,14 @@ md5_shim_la_LDFLAGS = -module -avoid-version -shared
 noinst_PROGRAMS = md5-const
 md5_const_SOURCES = md5-const.c md5-shim.h
 
-md5-shim.c md5-const.c md5-types.bin: md5.cdecl md5-shim.h
+md5-shim.c: stamp-shim
+md5-const.c: stamp-shim
+md5-types.bin: stamp-shim
+stamp-shim: md5.cdecl md5-shim.h
+       touch stamp-shim
        echo '(generate-shim "md5" "#include \"md5-shim.h\"")' \
-       | $(MIT_SCHEME_EXE) --batch-mode
+       | $(MIT_SCHEME_EXE) --batch-mode \
+       || rm stamp-shim
 
 md5-const.bin: md5-const.scm
        echo '(sf "md5-const")' | $(MIT_SCHEME_EXE) --batch-mode
@@ -60,10 +65,15 @@ md5-const.bin: md5-const.scm
 md5-const.scm: md5-const
        ./md5-const
 
-md5.bin md5.bci md5.com md5-@MIT_SCHEME_OS_SUFFIX@.pkd: \
-  md5.scm md5-const.bin md5-types.bin
+md5.bin: stamp-scheme
+md5.bci: stamp-scheme
+md5.com: stamp-scheme
+md5-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+stamp-scheme: stamp-shim md5.scm
+       touch stamp-scheme
        echo '(load "compile.scm")' \
-       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode
+       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
+       || rm stamp-scheme
 
 CLEANFILES = md5-const* md5-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
@@ -75,15 +85,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
+#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_md5dir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_md5dir)"
-       [ -d "$(DESTDIR)$(htmldir)" ]                                   \
-       && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
-            | $(MIT_SCHEME_EXE) --batch-mode )
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )

diff --git a/src/mhash/Makefile.am b/src/mhash/Makefile.am
index b2e23a334561622edda8d8175e1498e295d5f049..1e0cd9240ddbd6d5663e86347fb766945353a406 100644 (file)
--- a/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@ -50,9 +50,14 @@ mhash_shim_la_LDFLAGS = -module -avoid-version -shared
 noinst_PROGRAMS = mhash-const
 mhash_const_SOURCES = mhash-const.c mhash-shim.h
 
-mhash-shim.c mhash-const.c mhash-types.bin: mhash.cdecl mhash-shim.h
+mhash-shim.c: stamp-shim
+mhash-const.c: stamp-shim
+mhash-types.bin: stamp-shim
+stamp-shim: mhash.cdecl mhash-shim.h
+       touch stamp-shim
        echo '(generate-shim "mhash" "#include \"mhash-shim.h\"")' \
-       | $(MIT_SCHEME_EXE) --batch-mode
+       | $(MIT_SCHEME_EXE) --batch-mode \
+       || rm stamp-shim
 
 mhash-const.bin: mhash-const.scm
        echo '(sf "mhash-const")' | $(MIT_SCHEME_EXE) --batch-mode
@@ -60,10 +65,15 @@ mhash-const.bin: mhash-const.scm
 mhash-const.scm: mhash-const
        ./mhash-const
 
-mhash.bin mhash.bci mhash.com mhash-@MIT_SCHEME_OS_SUFFIX@.pkd: \
-  mhash.scm mhash-const.bin mhash-types.bin
+mhash.bin: stamp-scheme
+mhash.bci: stamp-scheme
+mhash.com: stamp-scheme
+mhash-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+stamp-scheme: stamp-shim mhash.scm
+       touch stamp-scheme
        echo '(load "compile.scm")' \
-       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode
+       | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
+       || rm stamp-scheme
 
 CLEANFILES = mhash-const* mhash-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
@@ -75,15 +85,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
+#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_mhashdir)" ] \
        && rmdir "$(DESTDIR)$(scmlib_mhashdir)"
-       [ -d "$(DESTDIR)$(htmldir)" ]                                   \
-       && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
-            | $(MIT_SCHEME_EXE) --batch-mode )
+#      [ -d "$(DESTDIR)$(htmldir)" ]                                   \
+#      && ( echo  '(update-html-index "$(DESTDIR)$(htmldir)/")'        \
+#           | $(MIT_SCHEME_EXE) --batch-mode )