From 0540c45c8657644117e6eee7fb52d275006e434b Mon Sep 17 00:00:00 2001 From: kpetersn Date: Wed, 5 Aug 2020 12:53:25 -0500 Subject: [PATCH] Renamed AcsMotion.dbd to AcsMotionSupport.dbd to avoid conflicts with the dbd file created by the build of the example IOC --- .../src/{AcsMotion.dbd => AcsMotionSupport.dbd} | 0 acsMotionApp/src/Makefile | 2 +- iocs/acsMotionIOC/acsMotionApp/src/Makefile | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) rename acsMotionApp/src/{AcsMotion.dbd => AcsMotionSupport.dbd} (100%) diff --git a/acsMotionApp/src/AcsMotion.dbd b/acsMotionApp/src/AcsMotionSupport.dbd similarity index 100% rename from acsMotionApp/src/AcsMotion.dbd rename to acsMotionApp/src/AcsMotionSupport.dbd diff --git a/acsMotionApp/src/Makefile b/acsMotionApp/src/Makefile index 9603ae1..1667c18 100644 --- a/acsMotionApp/src/Makefile +++ b/acsMotionApp/src/Makefile @@ -5,7 +5,7 @@ include $(TOP)/configure/CONFIG # The following are used for debugging messages. #USR_CXXFLAGS += -DDEBUG -DBD += AcsMotion.dbd +DBD += AcsMotionSupport.dbd LIBRARY_IOC = AcsMotion diff --git a/iocs/acsMotionIOC/acsMotionApp/src/Makefile b/iocs/acsMotionIOC/acsMotionApp/src/Makefile index 388f872..ebf4cb5 100644 --- a/iocs/acsMotionIOC/acsMotionApp/src/Makefile +++ b/iocs/acsMotionIOC/acsMotionApp/src/Makefile @@ -12,19 +12,19 @@ include $(TOP)/configure/CONFIG # Build the IOC application PROD_IOC = acsMotion -# acsMotionIOC.dbd will be created and installed -DBD += acsMotionIOC.dbd +# acsMotion.dbd will be created and installed +DBD += acsMotion.dbd # acsMotion.dbd will be made up from these files: -acsMotionIOC_DBD += base.dbd +acsMotion_DBD += base.dbd # Include dbd files from all support applications: #ifdef ASYN -acsMotionIOC_DBD += asyn.dbd -acsMotionIOC_DBD += drvAsynIPPort.dbd +acsMotion_DBD += asyn.dbd +acsMotion_DBD += drvAsynIPPort.dbd #endif -acsMotionIOC_DBD += motorSupport.dbd -acsMotionIOC_DBD += AcsMotion.dbd +acsMotion_DBD += motorSupport.dbd +acsMotion_DBD += AcsMotionSupport.dbd # Add all the support libraries needed by this IOC acsMotion_LIBS += AcsMotion