diff --git a/src/std/softIoc/Makefile b/src/std/softIoc/Makefile index 74a505b74..13f883155 100644 --- a/src/std/softIoc/Makefile +++ b/src/std/softIoc/Makefile @@ -15,6 +15,14 @@ PROD_IOC_iOS = -nil- DBD += base.dbd DBD += softIoc.dbd +base_DBD += menuGlobal.dbd +base_DBD += menuConvert.dbd +base_DBD += stdRecords.dbd +base_DBD += filters.dbd +base_DBD += devSoft.dbd +base_DBD += asSub.dbd +base_DBD += dbCore.dbd + softIoc_DBD += base.dbd softIoc_DBD += dlload.dbd softIoc_DBD += system.dbd diff --git a/src/std/softIoc/RULES b/src/std/softIoc/RULES index 91535d292..b35e125dc 100644 --- a/src/std/softIoc/RULES +++ b/src/std/softIoc/RULES @@ -7,8 +7,10 @@ # This is a Makefile fragment, see src/ioc/Makefile. -softIoc.dbd$(DEP): $(INSTALL_DBD)/stdRecords.dbd -$(COMMON_DIR)/softIoc.dbd: $(INSTALL_DBD)/stdRecords.dbd +base.dbd$(DEP): $(COMMON_DIR)/stdRecords.dbd +softIoc.dbd$(DEP): $(COMMON_DIR)/base.dbd +$(COMMON_DIR)/base.dbd: $(COMMON_DIR)/stdRecords.dbd +$(COMMON_DIR)/softIoc.dbd: $(COMMON_DIR)/base.dbd softMain$(OBJ): epicsInstallDir.h diff --git a/src/std/softIoc/asSub.dbd b/src/std/softIoc/asSub.dbd new file mode 100644 index 000000000..d02852fae --- /dev/null +++ b/src/std/softIoc/asSub.dbd @@ -0,0 +1,3 @@ +# Register access security subroutines +registrar(asSub) + diff --git a/src/std/softIoc/base.dbd b/src/std/softIoc/base.dbd deleted file mode 100644 index 3134fc4fe..000000000 --- a/src/std/softIoc/base.dbd +++ /dev/null @@ -1,23 +0,0 @@ -# $Revision-Id$ -# -# This file defines the standard record types and device support -# provided by Base and (usually) loaded into all IOCs. - -# Menus -include "menuGlobal.dbd" -include "menuConvert.dbd" - -# Record types -include "stdRecords.dbd" - -# Channel filters & plugins -include "filters.dbd" - -# "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support -include "devSoft.dbd" - -# Access security subroutines -registrar(asSub) - -include "dbCore.dbd" -