Conditionals on 'DBD +=' lines are causing parallel build errors. EPICS_HOST_ARCH needs to build all *.dbd's.

This commit is contained in:
Ron Sluiter
2010-04-26 20:33:33 +00:00
parent 261c1f6741
commit acf99307b6
2 changed files with 11 additions and 10 deletions
+11 -8
View File
@@ -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
-2
View File
@@ -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