From 74e63d2b600ef7c555eccc7de969288ce0ad9638 Mon Sep 17 00:00:00 2001
From: Olaf Seibert <rhialto@falu.nl>
Date: Sat, 23 Jan 2016 23:19:19 +0100
Subject: [PATCH] Eliminate recursive Make invocation

by moving the model-specific CONFFLAGS into the model-specific
makefile fragments.
---
 configure.ac     |  5 +++--
 mk/top-kl.mk     | 22 +++++++++++++++++++++-
 mk/top-ks-its.mk | 23 ++++++++++++++++++++++-
 mk/top-ks.mk     | 20 +++++++++++++++++++-
 mk/top.mk        |  2 +-
 5 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index dc790d0..bbb028b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
 # Process this file with autogen.sh to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([klh10], [2.0i], [https://github.com/Rhialto/klh10])
+AC_INIT([klh10], [2.0i-Rhialto], [https://github.com/Rhialto/klh10],
+	[], [https://github.com/Rhialto/klh10])
 AC_CONFIG_SRCDIR([src/klh10.h])
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -119,7 +120,7 @@ typedef char vaddr_t;
 ])
 
 # -------------------------------------------------------------------------
-# Check how to replace strerror()
+# Check how to replace strerror() if needed
 # -------------------------------------------------------------------------
 
 AC_MSG_CHECKING([whether sys_errlist exists])
diff --git a/mk/top-kl.mk b/mk/top-kl.mk
index 2483311..53b6f91 100644
--- a/mk/top-kl.mk
+++ b/mk/top-kl.mk
@@ -1,5 +1,25 @@
 # Makefile fragment for building kl
 
-all:	base-kl tapedd vdkfmt wxtest enaddr
+####################################################################
+##	Specific KLH10 configuration
+##
+
+# Standard setup for KL (TOPS-10 and TOPS-20)
+#
+CONFFLAGS = -DKLH10_CPU_KLX=1	\
+	    -DKLH10_SYS_T20=1	\
+	    -DKLH10_EVHS_INT=1	\
+		    -DKLH10_DEV_DPNI20=1 \
+		    -DKLH10_DEV_DPTM03=1 \
+		    -DKLH10_DEV_DPRPXX=1 \
+	    -DKLH10_MEM_SHARED=1	\
+	    -DKLH10_RTIME_OSGET=1	\
+	    -DKLH10_ITIME_INTRP=1	\
+	    -DKLH10_CTYIO_INT=1	\
+	    -DKLH10_APRID_SERIALNO=3600 \
+	    -DKLH10_CLIENT=\"MyKL\" \
+	    $(CONFFLAGS_AUX)
+
+all:	kn10-kl tapedd vdkfmt wxtest enaddr
 
 #---
diff --git a/mk/top-ks-its.mk b/mk/top-ks-its.mk
index 82d7a33..1f8b15c 100644
--- a/mk/top-ks-its.mk
+++ b/mk/top-ks-its.mk
@@ -1,5 +1,26 @@
 # Makefile fragment for building ks-its
 
-all:	base-ks-its tapedd vdkfmt wxtest enaddr
+####################################################################
+##	Specific KLH10 configuration
+##
+
+# Standard setup for KS ITS
+#
+CONFFLAGS = -DKLH10_CPU_KS=1	\
+	    -DKLH10_SYS_ITS=1	\
+	    -DKLH10_EVHS_INT=1	\
+		    -DKLH10_DEV_DPTM03=1 \
+		    -DKLH10_DEV_DPRPXX=1 \
+		    -DKLH10_DEV_DPIMP=1 \
+	    -DKLH10_SIMP=0 \
+	    -DKLH10_MEM_SHARED=1 \
+	    $(TINTFLAGS) \
+	    $(DINTFLAGS) \
+	    -DKLH10_APRID_SERIALNO=4097 -DKLH10_DEVMAX=12 \
+	    -DKLH10_CLIENT=\"MyITS\" \
+	    $(CONFFLAGS_AUX) \
+	    -DVMTAPE_ITSDUMP=1
+
+all:	kn10-ks-its tapedd vdkfmt wxtest enaddr
 
 #---
diff --git a/mk/top-ks.mk b/mk/top-ks.mk
index ad02586..f59ce0f 100644
--- a/mk/top-ks.mk
+++ b/mk/top-ks.mk
@@ -1,5 +1,23 @@
 # Makefile fragment for building ks
 
-all:	base-ks tapedd vdkfmt wxtest enaddr
+####################################################################
+##	Specific KLH10 configuration
+##
+
+# Standard setup for KS (TOPS-20, maybe TOPS-10)
+#
+CONFFLAGS = -DKLH10_CPU_KS=1	\
+	    -DKLH10_SYS_T20=1	\
+	    -DKLH10_EVHS_INT=1	\
+		    -DKLH10_DEV_DPTM03=1 \
+		    -DKLH10_DEV_DPRPXX=1 \
+	    -DKLH10_MEM_SHARED=1 \
+	    $(TINTFLAGS) \
+	    $(DINTFLAGS) \
+	    -DKLH10_APRID_SERIALNO=4097 -DKLH10_DEVMAX=12 \
+	    -DKLH10_CLIENT=\"MyKS\" \
+	    $(CONFFLAGS_AUX)
+
+all:	kn10-ks tapedd vdkfmt wxtest enaddr
 
 #---
diff --git a/mk/top.mk b/mk/top.mk
index 49fb489..133cf5f 100644
--- a/mk/top.mk
+++ b/mk/top.mk
@@ -17,7 +17,7 @@
 
 SRC = @top_srcdir@/src
 BLDSRC = @top_builddir@/src
-CC ?= @CC@
+CC = @CC@
 CFLAGS = -c @CFLAGS@ -I$(BLDSRC) -I$(SRC)
 CFLAGS_LINT = -ansi -pedantic -Wall -Wshadow \
                 -Wstrict-prototypes -Wmissing-prototypes \