X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/cc501d138bd8af2df02c4cdfeb724224599a476d..8698accbb89627bf7358f6614de713be11bde3b8:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 867b149..b8f0e85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -127,6 +127,9 @@ sod$(EXEEXT): $(LISP_SOURCES) sod.asd sod-frontend.asd auto.lisp
 	$(V_DUMP)$(ASDF_ENV) $(CL_LAUNCH) -o $@ -d ! -l $(LISPSYS) +I \
 		-s sod-frontend -r sod-frontend:main
 
+## The executable is needed if we're just distributing.
+dist-hook: sod$(EXEEXT)
+
 ###--------------------------------------------------------------------------
 ### Unit testing.
 
@@ -154,11 +157,15 @@ sod-test.asd: sod-test.asd.in Makefile
 
 ## Running the Lisp tests.
 check-local: sod sod-test.asd
-	$(V_TEST)$(ASDF_ENV) $(CL_LAUNCH) -l $(LISPSYS) -s sod-test +I \
-		-i '(handler-case (asdf:test-system "sod") ;\
+	$(V_TEST)$(ASDF_ENV) $(CL_LAUNCH) -l $(LISPSYS) \
+		-s sod-frontend +I \
+		-i '(handler-case ;\
+			(progn ;\
+			  (asdf:load-system "sod-test") ;\
+			  (asdf:test-system "sod")) ;\
 		      (error (cond) ;\
 			(format *error-output* "ERR: ~A~%" cond) ;\
-			(cl-launch:quit 1)))'
+			(optparse:exit 1)))'
 
 ###--------------------------------------------------------------------------
 ### Manual pages.
@@ -208,4 +215,18 @@ uninstall-local:
 	  rm -f $(DESTDIR)$(pkglispsrcdir)/$$i $(DESTDIR)$(lispsysdir)/$$i; \
 	done
 
+###--------------------------------------------------------------------------
+### Additional random things useful during development.
+
+## ASDF hacking for finding the system definitions.
+EXTRA_DIST		+= asdf-hack.lisp.in
+noinst_DATA		+= asdf-hack.lisp
+asdf-hack.lisp: asdf-hack.lisp.in Makefile
+	$(SUBST) $(srcdir)/asdf-hack.lisp.in >$@.new $(SUBSTITUTIONS) && \
+		mv $@.new $@
+CLEANFILES		+= asdf-hack.lisp
+
+## Emacs hacking for indentation.
+EXTRA_DIST		+= emacs-hacks.el
+
 ###----- That's all, folks --------------------------------------------------