From acf99307b6aaa80512708f6c64cd88e9947e30b3 Mon Sep 17 00:00:00 2001
From: Ron Sluiter <rsluiter@users.noreply.github.com>
Date: Mon, 26 Apr 2010 20:33:33 +0000
Subject: [PATCH] Conditionals on 'DBD +=' lines are causing parallel build
 errors. EPICS_HOST_ARCH needs to build all *.dbd's.

---
 motorExApp/NoAsyn/Makefile   | 19 +++++++++++--------
 motorExApp/WithAsyn/Makefile |  2 --
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile
index 85687e69..64b6a953 100644
--- a/motorExApp/NoAsyn/Makefile
+++ b/motorExApp/NoAsyn/Makefile
@@ -1,3 +1,11 @@
+#FILENAME...     Makefile
+#USAGE...        Makefile for motor application example without Asyn
+
+#Version:        $Revision$
+#Modified By:    $Author$
+#Last Modified:  $Date$
+#HeadURL:        $URL$
+
 # "#!" marks lines that can be uncommented.
 
 # Makefile
@@ -14,20 +22,15 @@ COMMONDBDS  = base.dbd
 COMMONDBDS += motorRecord.dbd
 COMMONDBDS += devSoftMotor.dbd
 #!COMMONDBDS += devMXmotor.dbd
-ifeq ($(OS_CLASS), vxWorks)
-COMMONDBDS += devDeltaTau.dbd
-COMMONDBDS += MiscVx.dbd
-else
-COMMONDBDS += Misc.dbd
-endif
 
 DBD += NoAsyn.dbd
 NoAsyn_DBD += $(COMMONDBDS)
+NoAsyn_DBD += Misc.dbd
 
-ifeq ($(OS_CLASS), vxWorks)
 DBD += NoAsynVx.dbd
 NoAsynVx_DBD += $(COMMONDBDS)
-endif
+NoAsynVx_DBD += devDeltaTau.dbd
+NoAsynVx_DBD += MiscVx.dbd
 
 NoAsyn_SRCS += NoAsyn_registerRecordDeviceDriver.cpp
 NoAsyn_SRCS_DEFAULT += NoAsynMain.cpp
diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile
index 6adf8806..a21f8d93 100644
--- a/motorExApp/WithAsyn/Makefile
+++ b/motorExApp/WithAsyn/Makefile
@@ -41,14 +41,12 @@ ifdef SNCSEQ
 WithAsyn_DBD += devSequencer.dbd
 endif
 
-ifeq ($(OS_CLASS), vxWorks)
 DBD += WithAsynVx.dbd
 WithAsynVx_DBD += $(COMMONDBDS)
 #!WithAsynVx_DBD += drvGsIP488.dbd
 ifdef IPAC
 WithAsynVx_DBD += MiscVx.dbd
 endif
-endif
 
 WithAsyn_SRCS   += WithAsyn_registerRecordDeviceDriver.cpp
 WithAsyn_SRCS_DEFAULT += WithAsynMain.cpp