From f09a304204c69c48af909fcf1495575d16bc134b Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 23 May 2018 17:51:31 +0200
Subject: [PATCH] improve how calcout support is built depending on EPICS
 version

---
 src/CONFIG_STREAM | 5 ++++-
 src/Makefile.Host | 3 +--
 src/Makefile.Vx   | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/CONFIG_STREAM b/src/CONFIG_STREAM
index 7f574a4..d3814c9 100644
--- a/src/CONFIG_STREAM
+++ b/src/CONFIG_STREAM
@@ -9,9 +9,12 @@ RECORDTYPES += mbboDirect mbbiDirect
 RECORDTYPES += longout longin
 RECORDTYPES += stringout stringin
 RECORDTYPES += waveform
-RECORDTYPES += calcout
 RECORDTYPES += aai aao
 
+ifdef BASE_3_14
+RECORDTYPES += calcout
+endif
+
 # Do you have synApps and want support for scalcout?
 # Then define CALC or SYNAPPS in your RELEASE file
 # pointing to the 'calc' module of synApps.
diff --git a/src/Makefile.Host b/src/Makefile.Host
index 0b5a3b7..d13423f 100644
--- a/src/Makefile.Host
+++ b/src/Makefile.Host
@@ -35,6 +35,5 @@ SCRIPTS = munch.pl
 include $(EPICS_BASE)/config/RULES.Host
 
 # create stream.dbd from all RECORDTYPES
-# In 3.13, calcout has no device support
 stream.dbd: ../CONFIG_STREAM
-	$(PERL) ../makedbd.pl -3.13 $(filter-out calcout,$(RECORDTYPES)) > $@
+	$(PERL) ../makedbd.pl -3.13 $(RECORDTYPES) > $@
diff --git a/src/Makefile.Vx b/src/Makefile.Vx
index 3df2055..932726f 100644
--- a/src/Makefile.Vx
+++ b/src/Makefile.Vx
@@ -29,8 +29,7 @@ SRCS.cc += $(patsubst %,../%,$(filter %.cc,$(STREAM_SRCS)))
 SRCS.cc += $(BUSSES:%=../%Interface.cc)
 SRCS.cc += $(FORMATS:%=../%Converter.cc)
 SRCS.c += $(patsubst %,../%,$(filter %.c,$(STREAM_SRCS)))
-# In 3.13, calcout has no device support
-SRCS.c += $(patsubst %,../dev%Stream.c,$(filter-out calcout,$(RECORDTYPES)))
+SRCS.c += $(patsubst %,../dev%Stream.c,$(RECORDTYPES)))
 
 LIBOBJS = $(patsubst ../%,%.o,$(basename $(SRCS.cc) $(SRCS.c)))