X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/6c39ec6d05467457c590ec93ad98c179be6618af..e4b13205c44ec284966bfe9931ad48fed3484497:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e39d9bd..435b764 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,18 +54,6 @@ man_MANS		+= runlisp.1
 doc_DATA		+= runlisp.pdf
 EXTRA_DIST		+= runlisp.1.in
 
-noinst_PROGRAMS		+= old-runlisp
-old_runlisp_SOURCES	 = old-runlisp.c
-old_runlisp_LDADD	 = librunlisp.a
-
-noinst_PROGRAMS		+= toy
-toy_SOURCES		 = toy.c
-toy_LDADD		 = librunlisp.a
-
-noinst_PROGRAMS		+= hash
-hash_SOURCES		 = hash.c
-hash_LDADD		 = librunlisp.a
-
 ###--------------------------------------------------------------------------
 ### Additional machinery.
 
@@ -113,8 +101,9 @@ man_MANS		+= dump-runlisp-image.1
 doc_DATA		+= dump-runlisp-image.pdf
 EXTRA_DIST		+= dump-runlisp-image.1.in
 
-DUMP_RUNLISP_IMAGE	 = $(v_dump)./dump-runlisp-image \
-				-f -c$(srcdir)/runlisp-base.conf -O$@
+DUMP_RUNLISP_IMAGE	 = $(v_dump)./dump-runlisp-image -f -O$@ \
+				-c$(srcdir)/runlisp-base.conf \
+				-odata-dir=$(srcdir)
 
 v_dump			 = $(v_dump_@AM_V@)
 v_dump_			 = $(v_dump_@AM_DEFAULT_V@)
@@ -125,35 +114,35 @@ noinst_DATA		+= $(IMAGES)
 
 if DUMP_SBCL
 IMAGES			+= sbcl+asdf.core
-CLEANFILES		+= sbcl+asdf.core
+CLEANFILES		+= sbcl+asdf.core sbcl+asdf.core-*
 sbcl+asdf.core: dump-runlisp-image runlisp-base.conf
 	$(DUMP_RUNLISP_IMAGE) sbcl
 endif
 
 if DUMP_CCL
 IMAGES			+= ccl+asdf.image
-CLEANFILES		+= ccl+asdf.image
+CLEANFILES		+= ccl+asdf.image ccl+asdf.image-*
 ccl+asdf.image: dump-runlisp-image runlisp-base.conf
 	$(DUMP_RUNLISP_IMAGE) ccl
 endif
 
 if DUMP_CLISP
 IMAGES			+= clisp+asdf.mem
-CLEANFILES		+= clisp+asdf.mem
+CLEANFILES		+= clisp+asdf.mem clisp+asdf.mem-*
 clisp+asdf.mem: dump-runlisp-image runlisp-base.conf
 	$(DUMP_RUNLISP_IMAGE) clisp
 endif
 
 if DUMP_ECL
 IMAGES			+= ecl+asdf
-CLEANFILES		+= ecl+asdf
+CLEANFILES		+= ecl+asdf ecl+asdf-*
 ecl+asdf: dump-runlisp-image runlisp-base.conf dump-ecl
 	$(DUMP_RUNLISP_IMAGE) -odata-dir=$(srcdir) ecl
 endif
 
 if DUMP_CMUCL
 IMAGES			+= cmucl+asdf.core
-CLEANFILES		+= cmucl+asdf.core
+CLEANFILES		+= cmucl+asdf.core cmucl+asdf.core-*
 cmucl+asdf.core: dump-runlisp-image runlisp-base.conf
 	$(DUMP_RUNLISP_IMAGE) cmucl
 endif
@@ -184,6 +173,7 @@ uninstall-hook::
 
 ## Documentation.
 SUBDIRS			+= doc
+EXTRA_DIST		+= README.org
 
 ## Testing.
 SUBDIRS			+= t