Skip to content
Snippets Groups Projects
Commit af308c9e authored by mooney's avatar mooney
Browse files

conditions on DXP and (areaDetector's) commonDriverMakefile

parent c9e773e4
No related branches found
No related tags found
No related merge requests found
...@@ -107,9 +107,6 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A))) ...@@ -107,9 +107,6 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
iocxxxVX_DBD += camacSupport.dbd iocxxxVX_DBD += camacSupport.dbd
iocxxxVX_DBD += devCamacSupport.dbd iocxxxVX_DBD += devCamacSupport.dbd
ifdef DXP
iocxxxVX_DBD += dxpSupport.dbd
endif
ifdef ALLEN_BRADLEY ifdef ALLEN_BRADLEY
iocxxxVX_DBD += allenBradley.dbd iocxxxVX_DBD += allenBradley.dbd
endif endif
...@@ -222,9 +219,6 @@ xxx_LIBS_vxWorks += ipUnidig ...@@ -222,9 +219,6 @@ xxx_LIBS_vxWorks += ipUnidig
xxx_LIBS_vxWorks += dac128V xxx_LIBS_vxWorks += dac128V
xxx_LIBS_vxWorks += quadEM xxx_LIBS_vxWorks += quadEM
xxx_LIBS_vxWorks += camac devCamac xxx_LIBS_vxWorks += camac devCamac
ifdef DXP
xxx_LIBS_vxWorks += dxp handel
endif
xxx_LIBS_vxWorks += love xxx_LIBS_vxWorks += love
ifndef DEVIOCSTATS ifndef DEVIOCSTATS
xxx_LIBS_vxWorks += vxStats xxx_LIBS_vxWorks += vxStats
...@@ -256,8 +250,11 @@ ifneq ("",$(findstring linux, $(T_A))) ...@@ -256,8 +250,11 @@ ifneq ("",$(findstring linux, $(T_A)))
endif endif
# areaDetector provides a Makefile for things it needs and supplies # areaDetector provides a Makefile for things it needs and supplies
ifneq (solaris,$(findstring solaris, $(T_A)))
ifneq (vxWorks,$(findstring vxWorks, $(T_A)))
-include $(AREA_DETECTOR)/ADApp/commonDriverMakefile -include $(AREA_DETECTOR)/ADApp/commonDriverMakefile
endif
endif
#=========================== #===========================
include $(TOP)/configure/RULES include $(TOP)/configure/RULES
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment