X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/e29834b853038e8c90dcfe8377f02431cad42fc5..7b8ff279e7304e41b243459d78c3b6703bb8c3f5:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 02e9b42..42cb2e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,8 +39,19 @@ ACLOCAL_AMFLAGS		 = -Im4
 
 bin_PROGRAMS		+= runlisp
 runlisp_SOURCES		 = runlisp.c
+runlisp_SOURCES		+= common.c common.h
+runlisp_SOURCES		+= lib.c lib.h
+runlisp_SOURCES		+= mdwopt.c mdwopt.h
 man_MANS		+= runlisp.1
 
+noinst_PROGRAMS		+= old-runlisp
+old_runlisp_SOURCES	 = old-runlisp.c
+old_runlisp_SOURCES	+= lib.c lib.h
+
+noinst_PROGRAMS		+= toy
+toy_SOURCES		 = toy.c
+toy_SOURCES		+= lib.c lib.h
+
 ###--------------------------------------------------------------------------
 ### Additional machinery.
 
@@ -50,53 +61,53 @@ EXTRA_DIST		+= eval.lisp
 ###--------------------------------------------------------------------------
 ### Image dumping.
 
-nodist_bin_SCRIPTS	+= dump-runlisp-image
+bin_PROGRAMS		+= dump-runlisp-image
+dump_runlisp_image_SOURCES  = dump-runlisp-image.c
+dump_runlisp_image_SOURCES += common.c common.h
+dump_runlisp_image_SOURCES += lib.c lib.h
+dump_runlisp_image_SOURCES += mdwopt.c mdwopt.h
 man_MANS		+= dump-runlisp-image.1
 
+DUMP_RUNLISP_IMAGE	 = $(v_dump)./dump-runlisp-image \
+				-f -c$(srcdir)/runlisp.conf -O$@
+
 v_dump			 = $(v_dump_@AM_V@)
 v_dump_			 = $(v_dump_@AM_DEFAULT_V@)
 v_dump_0		 = @echo "  DUMP     $@";
 
-EXTRA_DIST		+= dump-runlisp-image.in
-CLEANFILES		+= dump-runlisp-image
-dump-runlisp-image: dump-runlisp-image.in
-	$(SUBST) $(srcdir)/dump-runlisp-image.in >$@.new \
-		$(SUBSTITUTIONS) && \
-		chmod +x $@.new && mv $@.new $@
-
 if DUMP_SBCL
 image_DATA		+= sbcl+asdf.core
 CLEANFILES		+= sbcl+asdf.core
-sbcl+asdf.core: dump-runlisp-image
-	$(v_dump)./dump-runlisp-image -o$@ sbcl
+sbcl+asdf.core: dump-runlisp-image runlisp.conf
+	$(DUMP_RUNLISP_IMAGE) sbcl
 endif
 
 if DUMP_CCL
 image_DATA		+= ccl+asdf.image
 CLEANFILES		+= ccl+asdf.image
-ccl+asdf.image: dump-runlisp-image
-	$(v_dump)./dump-runlisp-image -o$@ ccl
+ccl+asdf.image: dump-runlisp-image runlisp.conf
+	$(DUMP_RUNLISP_IMAGE) ccl
 endif
 
 if DUMP_CLISP
 image_DATA		+= clisp+asdf.mem
 CLEANFILES		+= clisp+asdf.mem
-clisp+asdf.mem: dump-runlisp-image
-	$(v_dump)./dump-runlisp-image -o$@ clisp
+clisp+asdf.mem: dump-runlisp-image runlisp.conf
+	$(DUMP_RUNLISP_IMAGE) clisp
 endif
 
 if DUMP_ECL
 image_SCRIPTS		+= ecl+asdf
 CLEANFILES		+= ecl+asdf
-ecl+asdf: dump-runlisp-image
-	$(v_dump)./dump-runlisp-image -o$@ ecl
+ecl+asdf: dump-runlisp-image runlisp.conf
+	$(DUMP_RUNLISP_IMAGE) -odata-dir=$(srcdir) ecl
 endif
 
 if DUMP_CMUCL
 image_DATA		+= cmucl+asdf.core
 CLEANFILES		+= cmucl+asdf.core
-cmucl+asdf.core: dump-runlisp-image
-	$(v_dump)./dump-runlisp-image -o$@ cmucl
+cmucl+asdf.core: dump-runlisp-image runlisp.conf
+	$(DUMP_RUNLISP_IMAGE) cmucl
 endif
 
 ###--------------------------------------------------------------------------