From 3aebbbd03807fe5bea4432f2aec3391101dfac86 Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Wed, 16 Oct 2024 10:28:42 +0100
Subject: [PATCH] Makefile: various consistency matters

Using defined variables ${RM} for common tools
error handling
ensuring default target (is not install)
---
 lisp/Makefile  | 2 ++
 oa/Makefile    | 2 +-
 scmos/Makefile | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/Makefile b/lisp/Makefile
index fbe343fb..4e4347d9 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -11,6 +11,8 @@ SCMSRC    = default.scm box.scm label.scm draw.scm drc.scm \
             stack.scm layout.scm prs.scm help.scm gate.scm \
             sel.scm
 
+all:
+
 include ${MAGICDIR}/defs.mak
 
 INST_SCMSRC = ${SCMSRC:%=$(DESTDIR)${INSTALL_SCMDIR}/%}
diff --git a/oa/Makefile b/oa/Makefile
index 1977766f..dea9feee 100644
--- a/oa/Makefile
+++ b/oa/Makefile
@@ -27,7 +27,7 @@ DEP_FILES = $(addprefix .deps/,$(SRCS:.c=.P))\
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 	>> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
+	${RM} .deps/$(*F).pp
 
 clean:
 	${RM} *.o
diff --git a/scmos/Makefile b/scmos/Makefile
index c72d259b..9516cb61 100644
--- a/scmos/Makefile
+++ b/scmos/Makefile
@@ -98,11 +98,11 @@ $(HCIFin):
 $(HCIFout):
 $(SCIFin):
 $(SCIFout):
-	cd cif_template; ${MAKE} clean; ${MAKE};
+	cd cif_template && ${MAKE} clean && ${MAKE}
 
 $(DESTDIR)${INSTALL_SYSDIR}/%: %
 	cp $* $(DESTDIR)${INSTALL_SYSDIR}/$*
 
 clean:;
-	-rm -f *.tech *.tech27
-	cd cif_template && ${MAKE} clean;
+	-$(RM) *.tech *.tech27
+	cd cif_template && ${MAKE} clean