From 071db8d48d18791891e2bb8f905c348315ff72f4 Mon Sep 17 00:00:00 2001
From: Ron Sluiter <rsluiter@users.noreply.github.com>
Date: Wed, 26 Oct 2011 14:06:15 +0000
Subject: [PATCH] Restore "standard" MAXv driver as the default; "trajectory"
 as an option.

---
 motorApp/OmsSrc/Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/motorApp/OmsSrc/Makefile b/motorApp/OmsSrc/Makefile
index d9b63bd5..43786aeb 100644
--- a/motorApp/OmsSrc/Makefile
+++ b/motorApp/OmsSrc/Makefile
@@ -5,17 +5,12 @@ include $(TOP)/configure/CONFIG
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 
 # The following are used for debugging messages.
-USR_CXXFLAGS += -DDEBUG
+#!USR_CXXFLAGS += -DDEBUG
 
 DBD += devOms.dbd
 
 LIBRARY_IOC_DEFAULT += oms
 
-# Trajectory support for MAXV controller
-ifdef SNCSEQ
-SRCS += MAX_trajectoryScan.st
-endif
-
 # The following is required for the OMS PC68/78 (i.e., devOmsPC68) device driver.
 ifdef ASYN
 SRCS += devOmsPC68.cc drvOmsPC68.cc
@@ -28,8 +23,17 @@ SRCS += devOms.cc drvOms.cc
 # The following is required for the OMS VME58 (i.e., devOms58) device driver.
 SRCS += devOms58.cc drvOms58.cc
 
-# The following is required for the OMS MAXv device driver.
-SRCS += devMAXv.cc drvMAXv_trajectory.cc
+# OMS MAXv device driver support.
+# Choose one; either "standard" or "trajectory".
+
+# Standard MAXv
+SRCS += devMAXv.cc drvMAXv.cc
+
+# Trajectory support for MAXV controller
+ifdef SNCSEQ
+#!SRCS += MAX_trajectoryScan.st
+endif
+#!SRCS_vxWorks += devMAXv.cc drvMAXv_trajectory.cc
 
 # The following is required for all OMS device drivers.
 SRCS += devOmsCom.cc