X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/7615305f00f2e44b3fab3ceb1b7f8d11764e68a0..fe28ef9d3cbbf7aefd42af24532267bb82e2067a:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 20c8dc3..b13d107 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,9 +101,16 @@ 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 -O$@ \
+DUMP_RUNLISP_IMAGE	 = $(v_dump)\
+			   ASDF_OUTPUT_TRANSLATIONS='( \
+				:output-translations \
+				:ignore-inherited-configuration \
+				(t ("$(abs_builddir)/" "fasl/" \
+					:implementation-type :**/ :*.*.*)))' \
+			   ./dump-runlisp-image -f -O$@ \
 				-c$(srcdir)/runlisp-base.conf \
 				-odata-dir=$(srcdir)
+clean-local::; rm -fr fasl
 
 v_dump			 = $(v_dump_@AM_V@)
 v_dump_			 = $(v_dump_@AM_DEFAULT_V@)
@@ -114,35 +121,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) 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
@@ -173,6 +180,7 @@ uninstall-hook::
 
 ## Documentation.
 SUBDIRS			+= doc
+EXTRA_DIST		+= README.org
 
 ## Testing.
 SUBDIRS			+= t
@@ -191,5 +199,6 @@ dist-hook::
 
 ## Additional build tools.
 EXTRA_DIST		+= config/auto-version
+EXTRA_DIST		+= config/confsubst
 
 ###----- That's all, folks --------------------------------------------------