From dd2f20148958f078063817f7bcd12804bd80b365 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Thu, 15 Sep 2011 20:31:49 +0000
Subject: [PATCH] if linux now doesn't require -x86 suffix net and pcap if
LINUX_NET_INSTALLED usb if LINUX_USB_INSTALLED
---
xxxApp/src/Makefile | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile
index ff47be6..e420a43 100644
--- a/xxxApp/src/Makefile
+++ b/xxxApp/src/Makefile
@@ -132,7 +132,7 @@ endif
endif
endif
-ifeq (linux-x86,$(findstring linux-x86, $(T_A)))
+ifneq ("",$(findstring linux, $(T_A)))
DBD += iocxxxLinux.dbd
iocxxxLinux_DBD += xxxCommonInclude.dbd
iocxxxLinux_DBD += ADSupport.dbd NDFileNetCDF.dbd
@@ -145,12 +145,14 @@ ifeq (linux-x86,$(findstring linux-x86, $(T_A)))
ifeq ($(LINUX_NET_INSTALLED), YES)
iocxxxLinux_DBD += mcaCanberraSupport.dbd
xxx_LIBS_Linux += mcaCanberra
+ xxx_SYS_LIBS_Linux += net pcap
endif
# If your host supports parallel port or USB interfaces to Saturn DXP, set
# LINUX_USB_INSTALLED to YES in <synApps>/configure/CONFIG_SITE.
ifeq ($(LINUX_USB_INSTALLED), YES)
iocxxxLinux_DBD += dxpSupport.dbd
xxx_LIBS_Linux += dxp handel
+ xxx_SYS_LIBS_Linux += usb
endif
ifdef DEVIOCSTATS
@@ -238,16 +240,6 @@ xxx_LIBS_cygwin32 += $(xxx_Common_LIBS)
xxx_LIBS_WIN32 += $(xxx_Common_LIBS)
xxx_LIBS_Darwin += $(xxx_Common_LIBS)
-# If the host has libnet and libpcap for mca/Canberra support
-# uncomment the following line.
-#xxx_SYS_LIBS_Linux += net pcap
-
-# For USB support on Saturn uncomment the following:
-ifneq ("",$(findstring linux, $(T_A)))
- ifeq ($(LINUX_USB_INSTALLED), YES)
- xxx_SYS_LIBS_Linux += usb
- endif
-endif
# areaDetector provides a Makefile for things it needs and supplies
ifneq (solaris,$(findstring solaris, $(T_A)))
--
GitLab