diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile index 9c8fcb816..15b49467f 100644 --- a/src/makeBaseApp/top/exampleApp/src/Makefile +++ b/src/makeBaseApp/top/exampleApp/src/Makefile @@ -40,17 +40,6 @@ example_LIBS += dbStaticIoc example_LIBS += ca example_LIBS += Com -iocsh_DIR = $(EPICS_BASE_LIB) -miscIoc_DIR = $(EPICS_BASE_LIB) -rsrvIoc_DIR = $(EPICS_BASE_LIB) -dbtoolsIoc_DIR = $(EPICS_BASE_LIB) -asIoc_DIR = $(EPICS_BASE_LIB) -dbIoc_DIR = $(EPICS_BASE_LIB) -registryIoc_DIR = $(EPICS_BASE_LIB) -dbStaticIoc_DIR = $(EPICS_BASE_LIB) -ca_DIR = $(EPICS_BASE_LIB) -Com_DIR = $(EPICS_BASE_LIB) - example_SRCS += xxxRecord.c example_SRCS += devXxxSoft.c example_SRCS += caMonitor.c @@ -61,18 +50,40 @@ example_SRCS_DEFAULT += exampleMain.c example_SRCS_vxWorks += -nil- example_OBJS_vxWorks += $(EPICS_BASE_BIN)/iocCoreLibrary + #The following adds drvTS support for vxWorks #example_OBJS_vxWorks += $(EPICS_BASE_BIN)/drvTS -#example_SRCS += sncExample.stt +#NOTES: +# 1)It is not possible to build sncExample both as a component of example +# and standalone. You must choose only one. +# 2)To build sncExample SNCSEQ must be defined in /configure/RELEASE -#seq_DIR = $(SNCSEQ_LIB) +#The following builds sncExample as a component of example +#example_SRCS += sncExample.stt #example_OBJS_vxWorks += $(SNCSEQ_BIN)/seqLibrary #example_OBJS_vxWorks += $(SNCSEQ_BIN)/pvLibrary -#example_OBJS_vxWorks += $(SNCSEQ_BIN)/pvCaLibrary +#seq_DIR = $(SNCSEQ_LIB) #example_LIBS += seq #example_LIBS += pv -#example_LIBS += pvCa + +#The following builds sncExample as a standalone application +#PROD += sncExample +#sncExample_SNCFLAGS += +m +#sncExample_SRCS += sncExample.stt +#seq_DIR = $(SNCSEQ_LIB) +#sncExample_LIBS += seq +#sncExample_LIBS += pv +#sncExample_LIBS += iocsh +#sncExample_LIBS += miscIoc +#sncExample_LIBS += rsrvIoc +#sncExample_LIBS += dbtoolsIoc +#sncExample_LIBS += asIoc +#sncExample_LIBS += dbIoc +#sncExample_LIBS += registryIoc +#sncExample_LIBS += dbStaticIoc +#sncExample_LIBS += ca +#sncExample_LIBS += Com -include ../baseLIBOBJS example_OBJS += $(LIBOBJS) diff --git a/src/makeBaseApp/top/exampleApp/src/sncExample.stt b/src/makeBaseApp/top/exampleApp/src/sncExample.stt index 1e0a9861f..30fee6cda 100644 --- a/src/makeBaseApp/top/exampleApp/src/sncExample.stt +++ b/src/makeBaseApp/top/exampleApp/src/sncExample.stt @@ -1,4 +1,4 @@ -program snctest +program sncExample float v; assign v to "{user}:xxxExample"; monitor v; diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd index ad8efd1a7..1302586e9 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd +++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd @@ -29,4 +29,4 @@ dbLoadRecords("db/dbExample2.db","user=_USER_,no=3,scan=5 second") cd startup iocInit -#seq &snctest,"user=_USER_" +#seq &sncExample,"user=_USER_" diff --git a/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host b/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host index aae0b3e57..8ed2e6306 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host +++ b/src/makeBaseApp/top/exampleBoot/ioc/stcmd.host @@ -5,4 +5,4 @@ dbLoadRecords("../../db/dbExample2.db","user=_USER_Host,no=1,scan=1 second") dbLoadRecords("../../db/dbExample2.db","user=_USER_Host,no=2,scan=2 second") dbLoadRecords("../../db/dbExample2.db","user=_USER_Host,no=3,scan=5 second") iocInit() -#seq snctest,"user=_USER_Host" +#seq sncExample,"user=_USER_Host" diff --git a/src/makeBaseApp/top/simpleApp/src/Makefile b/src/makeBaseApp/top/simpleApp/src/Makefile index 416eaad73..17023785d 100644 --- a/src/makeBaseApp/top/simpleApp/src/Makefile +++ b/src/makeBaseApp/top/simpleApp/src/Makefile @@ -8,9 +8,6 @@ include $(TOP)/configure/CONFIG PROD_LIBS += ca PROD_LIBS += Db PROD_LIBS += Com -ca_DIR = $(EPICS_BASE_LIB) -Db_DIR = $(EPICS_BASE_LIB) -Com_DIR = $(EPICS_BASE_LIB) #PROD =