X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/e0808c472145fc81e52898bc9ac289e10c4f4f41..6390b8458f7d363a58c1d6fcb0723dc9eb61e68e:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2871ae9..e13f157 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ LISP_SOURCES		 =
 SYSDEFS			 =
 
 ASDF_ENV		 = \
+	CL_SOURCE_REGISTRY=$$(pwd): \
 	ASDF_OUTPUT_TRANSLATIONS=$$(cd $(srcdir); pwd):$(abs_builddir):
 
 ###--------------------------------------------------------------------------
@@ -122,8 +123,8 @@ sod-frontend.asd: sod-frontend.asd.in Makefile
 ## Building the executable image.
 bin_PROGRAMS		+= sod
 sod_SOURCES		 =
-sod: $(LISP_SOURCES) sod.asd sod-frontend.asd auto.lisp
-	$(V_DUMP)$(ASDF_ENV) $(CL_LAUNCH) -o sod -d ! -l $(LISPSYS) +I \
+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
 
 ###--------------------------------------------------------------------------
@@ -153,11 +154,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.