diff --git a/ADApp/andorSrc/Makefile b/ADApp/andorSrc/Makefile
index 75af3c1..4dd4f07 100755
--- a/ADApp/andorSrc/Makefile
+++ b/ADApp/andorSrc/Makefile
@@ -10,10 +10,6 @@ LIB_SRCS += andorCCD.cpp
 
 DATA+=GREY.PAL
 
-# <name>.dbd will be created from <name>Include.dbd
-DBD += andorCCDApp.dbd
-DBD += andorCCDSupport.dbd
-
 # Note: we do things below in an arch-dependent way because we must built the application
 # without GraphicsMagick for windows-x64.  This is because of a conflict with the Andor
 # library (SetImage function) that only occurs on windows-x64.  So we build all
@@ -25,9 +21,17 @@ DBD += andorCCDSupport.dbd
 # Add locally compiled object code
 PROD_LIBS += andorCCD
 
+PROD_NAME = andorCCDApp
+
+# <name>.dbd will be created from <name>Include.dbd
+DBD += $(PROD_NAME).dbd
+$(PROD_NAME)_DBD += andorCCDSupport.dbd
+DBD += andorCCDSupport.dbd
+
+
 ifeq (win32-x86, $(findstring win32-x86, $(T_A)))
 PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
-PROD_IOC  += andorCCDApp
+PROD_IOC  += $(PROD_NAME)
 PROD_LIBS += ATMCD32M
 #PROD_IOC += accumTest
 #accumTest_SRCS += accumTest.c
@@ -38,12 +42,12 @@ PROD_LIBS += ATMCD32M
 
 else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
 PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
-PROD_IOC  += andorCCDApp
+PROD_IOC  += $(PROD_NAME)
 PROD_LIBS += atmcd64m
 
 else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
 PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
-PROD_IOC  += andorCCDApp
+PROD_IOC  += $(PROD_NAME)
 PROD_LIBS += andor
 STATIC_BUILD=NO
 #PROD_IOC += accumTest
@@ -55,7 +59,7 @@ STATIC_BUILD=NO
 
 else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
 PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
-PROD_IOC  += andorCCDApp
+PROD_IOC  += $(PROD_NAME)
 PROD_LIBS += andor
 STATIC_BUILD=NO