From ec8b13fc555d66e58298b6b4ef8c00e37616234f Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Tue, 6 Mar 2012 22:22:53 +0000
Subject: [PATCH] Added commented out lines for tests on Linux; change so all
 archs use DBD file without GraphicsMagick because of name conflict with
 SetImage()

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14596 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/andorSrc/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ADApp/andorSrc/Makefile b/ADApp/andorSrc/Makefile
index fc5d463..75af3c1 100755
--- a/ADApp/andorSrc/Makefile
+++ b/ADApp/andorSrc/Makefile
@@ -37,9 +37,8 @@ PROD_LIBS += ATMCD32M
 #FKTest_LIBS += ATMCD32M 
 
 else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
-PROD_SRCS += andorCCDAppWin64_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
-DBD       += andorCCDAppWin64.dbd
-PROD_IOC  += andorCCDAppWin64
+PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
+PROD_IOC  += andorCCDApp
 PROD_LIBS += atmcd64m
 
 else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
@@ -47,6 +46,12 @@ PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
 PROD_IOC  += andorCCDApp
 PROD_LIBS += andor
 STATIC_BUILD=NO
+#PROD_IOC += accumTest
+#accumTest_SRCS += accumTest.c
+#PROD_IOC += FKTest
+#FKTest_SRCS += FKTest.c
+#PROD_IOC += linuxTest
+#linuxTest_SRCS += linuxTest.c
 
 else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
 PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp