From 06d8ca1a561c22af5b2ad39bfa7c3768871ac6ab Mon Sep 17 00:00:00 2001
From: Olaf Seibert <rhialto@falu.nl>
Date: Sat, 23 Jan 2016 23:25:31 +0100
Subject: [PATCH] Get CONFFLAGS_AUX  from old build files, and avoid double
 inclusion of it.

---
 mk/top-kl.mk     | 3 +--
 mk/top-ks-its.mk | 1 -
 mk/top-ks.mk     | 3 +--
 mk/top.mk        | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mk/top-kl.mk b/mk/top-kl.mk
index 53b6f91..ad3d493 100644
--- a/mk/top-kl.mk
+++ b/mk/top-kl.mk
@@ -17,8 +17,7 @@ CONFFLAGS = -DKLH10_CPU_KLX=1	\
 	    -DKLH10_ITIME_INTRP=1	\
 	    -DKLH10_CTYIO_INT=1	\
 	    -DKLH10_APRID_SERIALNO=3600 \
-	    -DKLH10_CLIENT=\"MyKL\" \
-	    $(CONFFLAGS_AUX)
+	    -DKLH10_CLIENT=\"MyKL\"
 
 all:	kn10-kl tapedd vdkfmt wxtest enaddr
 
diff --git a/mk/top-ks-its.mk b/mk/top-ks-its.mk
index 1f8b15c..d5e0a0a 100644
--- a/mk/top-ks-its.mk
+++ b/mk/top-ks-its.mk
@@ -18,7 +18,6 @@ CONFFLAGS = -DKLH10_CPU_KS=1	\
 	    $(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 f59ce0f..e663034 100644
--- a/mk/top-ks.mk
+++ b/mk/top-ks.mk
@@ -15,8 +15,7 @@ CONFFLAGS = -DKLH10_CPU_KS=1	\
 	    $(TINTFLAGS) \
 	    $(DINTFLAGS) \
 	    -DKLH10_APRID_SERIALNO=4097 -DKLH10_DEVMAX=12 \
-	    -DKLH10_CLIENT=\"MyKS\" \
-	    $(CONFFLAGS_AUX)
+	    -DKLH10_CLIENT=\"MyKS\"
 
 all:	kn10-ks tapedd vdkfmt wxtest enaddr
 
diff --git a/mk/top.mk b/mk/top.mk
index 133cf5f..25dc19d 100644
--- a/mk/top.mk
+++ b/mk/top.mk
@@ -33,5 +33,6 @@ KLH10_HOME ?= ${DESTDIR}@bindir@
 # Source definitions
 CENVFLAGS = @CENVFLAGS@
 MAKEFILE = @MAKEFILE@
+CONFFLAGS_AUX = -DKLH10_I_CIRC=1
 
 #---