From 606441c089ace7b4087fc8029ff15f1e1ab21b5b Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 14 Mar 2000 20:23:07 +0000 Subject: [PATCH] changes for 3.14 --- src/makeBaseApp/top/exampleApp/src/Makefile | 10 +++++----- src/makeBaseApp/top/exampleApp/src/base.dbd | 1 - src/makeBaseApp/top/exampleApp/src/baseLIBOBJS | 1 - src/makeBaseApp/top/exampleApp/src/devXxxSoft.c | 1 + src/makeBaseApp/top/exampleApp/src/xxxRecord.c | 2 ++ 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile index b76a40e4d..827e58d0f 100644 --- a/src/makeBaseApp/top/exampleApp/src/Makefile +++ b/src/makeBaseApp/top/exampleApp/src/Makefile @@ -6,7 +6,7 @@ include $(TOP)/configure/CONFIG #USR_CFLAGS += PROD_LIBS += ca -PROD_LIBS += Db +PROD_LIBS += dbStaticHost PROD_LIBS += Com ca_DIR = $(EPICS_BASE_LIB) Db_DIR = $(EPICS_BASE_LIB) @@ -24,14 +24,14 @@ LIBRARY_IOC = exampleLib exampleLib_SRCS += xxxRecord.c exampleLib_SRCS += devXxxSoft.c -exampleLib_SRCS += sncExample.c +#exampleLib_SRCS += sncExample.c #exampleLib_SRCS += registerRecordDeviceDriver.c -LIBOBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o +exampleLib_OBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o -LIBOBJS += $(EPICS_BASE_BIN)/iocCore -LIBOBJS += $(EPICS_BASE_BIN)/seq +exampleLib_OBJS += $(EPICS_BASE_BIN)/iocCore +#exampleLib_OBJS += $(EPICS_BASE_BIN)/seq -include ../baseLIBOBJS diff --git a/src/makeBaseApp/top/exampleApp/src/base.dbd b/src/makeBaseApp/top/exampleApp/src/base.dbd index 20224f14d..534494db5 100644 --- a/src/makeBaseApp/top/exampleApp/src/base.dbd +++ b/src/makeBaseApp/top/exampleApp/src/base.dbd @@ -24,7 +24,6 @@ include "mbbiDirectRecord.dbd" include "mbboRecord.dbd" include "mbboDirectRecord.dbd" include "permissiveRecord.dbd" -include "pidRecord.dbd" #include "pulseCounterRecord.dbd" #include "pulseDelayRecord.dbd" #include "pulseTrainRecord.dbd" diff --git a/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS b/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS index 8d2ff7152..7826cb47d 100644 --- a/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS +++ b/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS @@ -24,7 +24,6 @@ LIBOBJS += $(EPICS_BASE_BIN)/mbboRecord.o LIBOBJS += $(EPICS_BASE_BIN)/mbboDirectRecord.o #LIBOBJS += $(EPICS_BASE_BIN)/palRecord.o LIBOBJS += $(EPICS_BASE_BIN)/permissiveRecord.o -LIBOBJS += $(EPICS_BASE_BIN)/pidRecord.o #LIBOBJS += $(EPICS_BASE_BIN)/pulseCounterRecord.o #LIBOBJS += $(EPICS_BASE_BIN)/pulseDelayRecord.o #LIBOBJS += $(EPICS_BASE_BIN)/pulseTrainRecord.o diff --git a/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c b/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c index e37d031b5..23c9bb35f 100644 --- a/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c +++ b/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c @@ -10,6 +10,7 @@ #include "cvtTable.h" #include "dbDefs.h" #include "dbAccess.h" +#include "recGbl.h" #include "recSup.h" #include "devSup.h" #include "link.h" diff --git a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c b/src/makeBaseApp/top/exampleApp/src/xxxRecord.c index 8f17b6a39..566b540a4 100644 --- a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c +++ b/src/makeBaseApp/top/exampleApp/src/xxxRecord.c @@ -7,6 +7,8 @@ #include #include "alarm.h" +#include "dbAccess.h" +#include "recGbl.h" #include "dbEvent.h" #include "dbDefs.h" #include "dbAccess.h"