From ca2abbfe1d9f3e218d481346fb30c01521edfb53 Mon Sep 17 00:00:00 2001 From: timmmooney <mooney@aps.anl.gov> Date: Fri, 6 Mar 2009 18:32:42 +0000 Subject: [PATCH] use LINUX_TIFF_INSTALLED --- xxxApp/src/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile index 0223261..a8ea40c 100644 --- a/xxxApp/src/Makefile +++ b/xxxApp/src/Makefile @@ -138,10 +138,12 @@ xxx_SYS_LIBS_vxWorks += -nil- # This is needed by areaDetector on Linux and WIN32 xxx_LIBS_WIN32 += PvAPI -# Couldn't get areaDetector to build on Linux with, e.g., libtiff.so. -# Comment this out until we get libtiff.a installed, or solve the problem -# some other way. tmm -#xxx_LIBS_Linux += PvAPI + +ifeq ($(EPICS_HOST_ARCH), linux-x86) +ifeq ($(LINUX_TIFF_INSTALLED), YES) +xxx_LIBS_Linux += PvAPI +endif +endif # This is needed by dxp on cygwin and WIN32 xxx_SYS_LIBS_cygwin32 += DLPORTIO PlxApi setupapi -- GitLab