From 31189ebecf384538366d2558359d091787abbcdf Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 25 Jan 2017 15:02:24 +0100
Subject: [PATCH] move scalcout to src

---
 Makefile                                | 11 ++---------
 src/CONFIG_STREAM                       |  9 ++++++---
 {srcSynApps => src}/devscalcoutStream.c |  0
 srcSynApps/Makefile                     | 23 -----------------------
 4 files changed, 8 insertions(+), 35 deletions(-)
 rename {srcSynApps => src}/devscalcoutStream.c (100%)
 delete mode 100644 srcSynApps/Makefile

diff --git a/Makefile b/Makefile
index be859f2..13bc2db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,5 @@
 TOP = ..
 
-DIRS = src
-streamApp_DEPEND_DIRS  = src
-
 # Look if we have EPICS R3.13 or R3.14
 ifneq ($(wildcard $(TOP)/configure),)
   # EPICS R3.14
@@ -16,12 +13,8 @@ else
   include $(TOP)/configure/CONFIG
 endif
 
+DIRS = src
+streamApp_DEPEND_DIRS  = src
 DIRS += streamApp
-ifneq ($(words $(CALC) $(SYNAPPS)), 0)
-# with synApps calc module (contains scalcout)
-DIRS += srcSynApps
-srcSynApps_DEPEND_DIRS  = src
-streamApp_DEPEND_DIRS  += srcSynApps
-endif
 
 include $(CONFIG)/RULES_DIRS
diff --git a/src/CONFIG_STREAM b/src/CONFIG_STREAM
index 00c250d..64b839d 100644
--- a/src/CONFIG_STREAM
+++ b/src/CONFIG_STREAM
@@ -21,9 +21,12 @@ RECORDTYPES += aai aao
 # Due to strange cross dependencies in synApps
 # you have to build the 'sscan' and 'genSub'
 # modules before building 'calc'.
-# See doc/scalcout.html for a required fix in scalcout.
-
-SYNAPPS_RECORDTYPES += scalcout
+# The 'calc' version must be 2-4 or higher.
+# Up to version 2-6 (synApps 5.1) the 'calc' module needs a fix.
+# See doc/scalcout.html for details.
+ifneq ($(words $(CALC) $(SYNAPPS)), 0)
+RECORDTYPES += scalcout
+endif
 
 # You may add more bus interfaces
 # This requires the naming convention
diff --git a/srcSynApps/devscalcoutStream.c b/src/devscalcoutStream.c
similarity index 100%
rename from srcSynApps/devscalcoutStream.c
rename to src/devscalcoutStream.c
diff --git a/srcSynApps/Makefile b/srcSynApps/Makefile
deleted file mode 100644
index 385e5f2..0000000
--- a/srcSynApps/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TOP:=../$(TOP)
-
-include $(TOP)/configure/CONFIG
-
--include ../src/CONFIG_STREAM
--include ../../src/CONFIG_STREAM
-
-LIBRARY_DEFAULT = streamSynApps
-
-DBD += $(LIBRARY_DEFAULT).dbd
-
-ifeq ($(LOADABLE_MODULE),YES)
-SRCS += $(LIBRARY_DEFAULT)_registerRecordDeviceDriver.cpp
-endif 
-SRCS += $(SYNAPPS_RECORDTYPES:%=dev%Stream.c)
-
-LIB_LIBS += stream $(EPICS_BASE_IOC_LIBS)
-
-include $(TOP)/configure/RULES
-
-# create streamSynApps.dbd from all SYNAPPS_RECORDTYPES
-$(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../../src/CONFIG_STREAM
-	$(PERL) ../../src/makedbd.pl $(SYNAPPS_RECORDTYPES) > $@