Merge branch 'errtxt'

Also made sinqepicsApp work with the module based build system now being operational at PSI
Conflicts:
	iocBoot/iocsinqEPICS/envPaths
	iocBoot/iocsinqEPICS/st.cmd
	sinqEPICSApp/src/Makefile
This commit is contained in:
2017-07-04 08:38:40 +02:00
14 changed files with 241 additions and 41 deletions

32
Makefile.RHEL7 Normal file
View File

@ -0,0 +1,32 @@
include /ioc/tools/driver.makefile
MODULE=sinq
BUILDCLASSES=Linux
# additional module dependencies
REQUIRED+=SynApps
REQUIRED+=stream
# using a test version
scaler_VERSION=koennecke
TEMPLATES += sinqEPICSApp/Db/dimetix.db
TEMPLATES += sinqEPICSApp/Db/slsvme.db
TEMPLATES += sinqEPICSApp/Db/spsamor.db
DBDS += sinq.dbd
# What we need at SINQ
SOURCES += sinqEPICSApp/src/devScalerEL737.c
SOURCES += sinqEPICSApp/src/SINQController.cpp
SOURCES += sinqEPICSApp/src/SINQAxis.cpp
SOURCES += sinqEPICSApp/src/EL734Driver.cpp
SOURCES += sinqEPICSApp/src/NanotecDriver.cpp
SOURCES += sinqEPICSApp/src/stptok.cpp
SOURCES += sinqEPICSApp/src/PhytronDriver.cpp
SOURCES += sinqEPICSApp/src/pmacAsynIPPort.c
SOURCES += sinqEPICSApp/src/pmacAxis.cpp
SOURCES += sinqEPICSApp/src/pmacController.cpp
# MISCS would be the place to keep the stream device template files