plugin Makefile.ams (dist): Add missing files to EXTRA_DIST.

Fix ./fix-tags.sh to take the package name as an argument, to support
building the dist in strangely named directories like mit-scheme-
blowfish-0.1/.  Add a missing dependency of stamp-scheme on the .pkg
file.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 0fa9c837fa2fe059afb37b8471433257cd42da2a..a210eb74b5fba567c6a6cccae9dc9f1bef0b9eac 100644 (file)
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -73,7 +73,7 @@ blowfish.bin: stamp-scheme
 blowfish.bci: stamp-scheme
 blowfish.com: stamp-scheme
 blowfish-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
-stamp-scheme: stamp-shim $(sources)
+stamp-scheme: stamp-shim $(sources) blowfish.pkg
        touch stamp-scheme
        echo '(load "compile.scm")' \
        | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
@@ -86,13 +86,16 @@ TESTS = blowfish-check.sh
 CLEANFILES += test
 
 tags: tags-am
-       ./tags-fix.sh
+       ./tags-fix.sh blowfish
 
-all_sources = $(sources)
-all_sources += blowfish-check.scm blowfish-adapter.c blowfish-shim.h
+all_sources = $(sources) compile.scm make.scm
+all_sources += blowfish-check.scm blowfish-adapter.c blowfish-check.sh
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) blowfish.pkg
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls) blowfish.pkg
 
+EXTRA_DIST += $(all_sources) $(cdecls) blowfish.pkg
+EXTRA_DIST += optiondb.scm tags-fix.sh
+
 install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
        | $(MIT_SCHEME_EXE) --batch-mode

diff --git a/src/blowfish/tags-fix.sh b/src/blowfish/tags-fix.sh
index ae5d023e63bb8e41802bf079224cdbf686498b37..c2823ad7ffc2183bd9939fc7348422cef5072030 100755 (executable)
--- a/src/blowfish/tags-fix.sh
+++ b/src/blowfish/tags-fix.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 # -*-Scheme-*-
 #
-# Chop the generated -shim.c and -const.c files out of TAGS.
+# Chop the generated $1-shim.c and $1-const.c files out of TAGS.
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode <<\EOF
-(let ((name (pathname-name
-            (directory-pathname-as-file (working-directory-pathname)))))
+${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+(let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))
 

diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index f8916e01a5633fb4c9e635561ad16ad6b4d618bc..70bb0fb047930f6225584c97d31ee9bb53551bf7 100644 (file)
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -73,7 +73,7 @@ gdbm.bin: stamp-scheme
 gdbm.bci: stamp-scheme
 gdbm.com: stamp-scheme
 gdbm-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
-stamp-scheme: stamp-shim $(sources)
+stamp-scheme: stamp-shim $(sources) gdbm.pkg
        touch stamp-scheme
        echo '(load "compile.scm")' \
        | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
@@ -86,13 +86,16 @@ TESTS = gdbm-check.sh
 CLEANFILES += gdbm-check.db
 
 tags: tags-am
-       ./tags-fix.sh
+       ./tags-fix.sh gdbm
 
-all_sources = $(sources)
-all_sources += gdbm-check.scm gdbm-adapter.c gdbm-shim.h
+all_sources = $(sources) compile.scm make.scm
+all_sources += gdbm-check.scm gdbm-adapter.c gdbm-check.sh
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) gdbm.pkg
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls) gdbm.pkg
 
+EXTRA_DIST += $(all_sources) $(cdecls) gdbm.pkg
+EXTRA_DIST += optiondb.scm tags-fix.sh
+
 install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
        | $(MIT_SCHEME_EXE) --batch-mode

diff --git a/src/gdbm/tags-fix.sh b/src/gdbm/tags-fix.sh
index ae5d023e63bb8e41802bf079224cdbf686498b37..c2823ad7ffc2183bd9939fc7348422cef5072030 100755 (executable)
--- a/src/gdbm/tags-fix.sh
+++ b/src/gdbm/tags-fix.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 # -*-Scheme-*-
 #
-# Chop the generated -shim.c and -const.c files out of TAGS.
+# Chop the generated $1-shim.c and $1-const.c files out of TAGS.
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode <<\EOF
-(let ((name (pathname-name
-            (directory-pathname-as-file (working-directory-pathname)))))
+${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+(let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))
 

diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am
index c3675d44922e9762b149f108f823a9a745ab97b7..d456a7808a35e1d8d87ba4ac4806a11c3f2c3af2 100644 (file)
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@ -73,7 +73,7 @@ mcrypt.bin: stamp-scheme
 mcrypt.bci: stamp-scheme
 mcrypt.com: stamp-scheme
 mcrypt-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
-stamp-scheme: stamp-shim $(sources)
+stamp-scheme: stamp-shim $(sources) mcrypt.pkg
        touch stamp-scheme
        echo '(load "compile.scm")' \
        | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
@@ -86,13 +86,16 @@ TESTS = mcrypt-check.sh
 CLEANFILES += encrypted decrypted
 
 tags: tags-am
-       ./tags-fix.sh
+       ./tags-fix.sh mcrypt
 
-all_sources = $(sources)
-all_sources += mcrypt-check.scm mcrypt-adapter.c mcrypt-shim.h
+all_sources = $(sources) compile.scm make.scm
+all_sources += mcrypt-check.scm mcrypt-adapter.c mcrypt-check.sh
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) mcrypt.pkg
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls) mcrypt.pkg
 
+EXTRA_DIST += $(all_sources) $(cdecls) mcrypt.pkg
+EXTRA_DIST += optiondb.scm tags-fix.sh
+
 install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
        | $(MIT_SCHEME_EXE) --batch-mode

diff --git a/src/mcrypt/tags-fix.sh b/src/mcrypt/tags-fix.sh
index ae5d023e63bb8e41802bf079224cdbf686498b37..c2823ad7ffc2183bd9939fc7348422cef5072030 100755 (executable)
--- a/src/mcrypt/tags-fix.sh
+++ b/src/mcrypt/tags-fix.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 # -*-Scheme-*-
 #
-# Chop the generated -shim.c and -const.c files out of TAGS.
+# Chop the generated $1-shim.c and $1-const.c files out of TAGS.
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode <<\EOF
-(let ((name (pathname-name
-            (directory-pathname-as-file (working-directory-pathname)))))
+${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+(let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))
 

diff --git a/src/md5/Makefile.am b/src/md5/Makefile.am
index 5062864608195f040e73e0e6f5d1641907d01874..3bab01b1a45a8c7d6fefc7e44e287d2dd91e6caf 100644 (file)
--- a/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@ -73,7 +73,7 @@ md5.bin: stamp-scheme
 md5.bci: stamp-scheme
 md5.com: stamp-scheme
 md5-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
-stamp-scheme: stamp-shim $(sources)
+stamp-scheme: stamp-shim $(sources) md5.pkg
        touch stamp-scheme
        echo '(load "compile.scm")' \
        | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
@@ -86,13 +86,16 @@ TESTS = md5-check.sh
 CLEANFILES += sample
 
 tags: tags-am
-       ./tags-fix.sh
+       ./tags-fix.sh md5
 
-all_sources = $(sources)
-all_sources += md5-check.scm md5-adapter.c md5-shim.h
+all_sources = $(sources) compile.scm make.scm
+all_sources += md5-check.scm md5-adapter.c md5-check.sh
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) md5.pkg
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls) md5.pkg
 
+EXTRA_DIST += $(all_sources) $(cdecls) md5.pkg
+EXTRA_DIST += optiondb.scm tags-fix.sh
+
 install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
        | $(MIT_SCHEME_EXE) --batch-mode

diff --git a/src/md5/tags-fix.sh b/src/md5/tags-fix.sh
index ae5d023e63bb8e41802bf079224cdbf686498b37..c2823ad7ffc2183bd9939fc7348422cef5072030 100755 (executable)
--- a/src/md5/tags-fix.sh
+++ b/src/md5/tags-fix.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 # -*-Scheme-*-
 #
-# Chop the generated -shim.c and -const.c files out of TAGS.
+# Chop the generated $1-shim.c and $1-const.c files out of TAGS.
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode <<\EOF
-(let ((name (pathname-name
-            (directory-pathname-as-file (working-directory-pathname)))))
+${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+(let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))
 

diff --git a/src/mhash/Makefile.am b/src/mhash/Makefile.am
index 2d436639fd88d45e7b0fc0a2797cab7ceddee8db..915e0e2d86650f80cf7f081a4b868ea8c39aeeab 100644 (file)
--- a/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@ -73,7 +73,7 @@ mhash.bin: stamp-scheme
 mhash.bci: stamp-scheme
 mhash.com: stamp-scheme
 mhash-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
-stamp-scheme: stamp-shim $(sources)
+stamp-scheme: stamp-shim $(sources) mhash.pkg
        touch stamp-scheme
        echo '(load "compile.scm")' \
        | $(MIT_SCHEME_EXE) --prepend-library . --batch-mode \
@@ -86,13 +86,16 @@ TESTS = mhash-check.sh
 CLEANFILES += sample
 
 tags: tags-am
-       ./tags-fix.sh
+       ./tags-fix.sh mhash
 
-all_sources = $(sources)
-all_sources += mhash-check.scm mhash-adapter.c mhash-shim.h
+all_sources = $(sources) compile.scm make.scm
+all_sources += mhash-check.scm mhash-adapter.c mhash-check.sh
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) mhash.pkg
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls) mhash.pkg
 
+EXTRA_DIST += $(all_sources) $(cdecls) mhash.pkg
+EXTRA_DIST += optiondb.scm tags-fix.sh
+
 install-data-hook:
        echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
        | $(MIT_SCHEME_EXE) --batch-mode

diff --git a/src/mhash/tags-fix.sh b/src/mhash/tags-fix.sh
index ae5d023e63bb8e41802bf079224cdbf686498b37..c2823ad7ffc2183bd9939fc7348422cef5072030 100755 (executable)
--- a/src/mhash/tags-fix.sh
+++ b/src/mhash/tags-fix.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 # -*-Scheme-*-
 #
-# Chop the generated -shim.c and -const.c files out of TAGS.
+# Chop the generated $1-shim.c and $1-const.c files out of TAGS.
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode <<\EOF
-(let ((name (pathname-name
-            (directory-pathname-as-file (working-directory-pathname)))))
+${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+(let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))