From a1f332be016bf229563f283b04514db8f15739b6 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 11 Feb 2003 23:25:11 +0000 Subject: [PATCH] Moved base.dbd from both makeBaseApp templates into src/misc. An application only needs a copy if it wants to remove stuff. --- src/makeBaseApp/Makefile | 2 - src/makeBaseApp/top/simpleApp/src/base.dbd | 50 ------------------- src/misc/Makefile | 2 + .../top/exampleApp/src => misc}/base.dbd | 0 4 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 src/makeBaseApp/top/simpleApp/src/base.dbd rename src/{makeBaseApp/top/exampleApp/src => misc}/base.dbd (100%) diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index 350b31f96..a8ccd0069 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -21,7 +21,6 @@ TEMPLATES += top/exampleApp/Db/dbExample1.db TEMPLATES += top/exampleApp/Db/dbExample2.db TEMPLATES += top/exampleApp/Db/dbSubExample.db TEMPLATES += top/exampleApp/src/Makefile -TEMPLATES += top/exampleApp/src/base.dbd TEMPLATES += top/exampleApp/src/devXxxSoft.c TEMPLATES += top/exampleApp/src/xxxRecord.c TEMPLATES += top/exampleApp/src/_APPNAME_Include.dbd @@ -63,7 +62,6 @@ TEMPLATES += top/simpleApp/src/Makefile TEMPLATES += top/simpleApp/src/Makefile TEMPLATES += top/simpleApp/src/_APPNAME_Include.dbd TEMPLATES += top/simpleApp/src/_APPNAME_Main.cpp -TEMPLATES += top/simpleApp/src/base.dbd TEMPLATES += top/simpleBoot/Makefile TEMPLATES += top/simpleBoot/nfsCommands@vxWorks diff --git a/src/makeBaseApp/top/simpleApp/src/base.dbd b/src/makeBaseApp/top/simpleApp/src/base.dbd deleted file mode 100644 index 42cc92803..000000000 --- a/src/makeBaseApp/top/simpleApp/src/base.dbd +++ /dev/null @@ -1,50 +0,0 @@ -include "menuGlobal.dbd" -include "menuConvert.dbd" -include "aiRecord.dbd" -include "aoRecord.dbd" -include "biRecord.dbd" -include "boRecord.dbd" -include "calcRecord.dbd" -include "calcoutRecord.dbd" -include "compressRecord.dbd" -include "dfanoutRecord.dbd" -include "eventRecord.dbd" -include "fanoutRecord.dbd" -include "longinRecord.dbd" -include "longoutRecord.dbd" -include "mbbiRecord.dbd" -include "mbbiDirectRecord.dbd" -include "mbboRecord.dbd" -include "mbboDirectRecord.dbd" -include "permissiveRecord.dbd" -include "selRecord.dbd" -include "seqRecord.dbd" -include "stateRecord.dbd" -include "stringinRecord.dbd" -include "stringoutRecord.dbd" -include "subRecord.dbd" -include "subArrayRecord.dbd" -include "waveformRecord.dbd" -device(ai,CONSTANT,devAiSoft,"Soft Channel") -device(ai,CONSTANT,devAiSoftRaw,"Raw Soft Channel") -device(ao,CONSTANT,devAoSoft,"Soft Channel") -device(ao,CONSTANT,devAoSoftRaw,"Raw Soft Channel") -device(bi,CONSTANT,devBiSoft,"Soft Channel") -device(bi,CONSTANT,devBiSoftRaw,"Raw Soft Channel") -device(bo,CONSTANT,devBoSoft,"Soft Channel") -device(bo,CONSTANT,devBoSoftRaw,"Raw Soft Channel") -device(event,CONSTANT,devEventSoft,"Soft Channel") -device(longin,CONSTANT,devLiSoft,"Soft Channel") -device(longout,CONSTANT,devLoSoft,"Soft Channel") -device(mbbi,CONSTANT,devMbbiSoft,"Soft Channel") -device(mbbi,CONSTANT,devMbbiSoftRaw,"Raw Soft Channel") -device(mbbiDirect,CONSTANT,devMbbiDirectSoft,"Soft Channel") -device(mbbiDirect,CONSTANT,devMbbiDirectSoftRaw,"Raw Soft Channel") -device(mbbo,CONSTANT,devMbboSoft,"Soft Channel") -device(mbbo,CONSTANT,devMbboSoftRaw,"Raw Soft Channel") -device(mbboDirect,CONSTANT,devMbboDirectSoft,"Soft Channel") -device(mbboDirect,CONSTANT,devMbboDirectSoftRaw,"Raw Soft Channel") -device(stringin,CONSTANT,devSiSoft,"Soft Channel") -device(stringout,CONSTANT,devSoSoft,"Soft Channel") -device(subArray,CONSTANT,devSASoft,"Soft Channel") -device(waveform,CONSTANT,devWfSoft,"Soft Channel") diff --git a/src/misc/Makefile b/src/misc/Makefile index 09260da76..079b189eb 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -11,6 +11,8 @@ TOP=../.. include $(TOP)/configure/CONFIG +DBD += base.dbd + INC += epicsRelease.h INC += iocInit.h INC += asSubRecordFunctions.h diff --git a/src/makeBaseApp/top/exampleApp/src/base.dbd b/src/misc/base.dbd similarity index 100% rename from src/makeBaseApp/top/exampleApp/src/base.dbd rename to src/misc/base.dbd