From 32ba6d444b3bf1007f44fa496672397c41591ecc Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 31 Mar 2014 17:25:22 -0500 Subject: [PATCH] Cleaned up CONFIG_SITE file. Introduced WITH_COVERAGE Make variable to control build options. --- configure/CONFIG_SITE | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 527daed..f069d1d 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -8,23 +8,14 @@ # CONFIG_SITE.Common.$(T_A) # CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) -# Set this when you only want to compile this application -# for a subset of the cross-compiled target architectures -# that Base is built for. -#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 - -# Set this when your IOC and the host use different paths -# to access the application. This will be needed to boot -# from a Microsoft FTP server or with some NFS mounts. -# You must rebuild in the iocBoot directory for this to -# take effect. -#IOCS_APPL_TOP = - # If you don't want to install into $(TOP) then # define INSTALL_LOCATION here #INSTALL_LOCATION= -ifeq ($(EPICS_TEST_COVERAGE),1) +-include $(TOP)/configure/CONFIG_SITE.local +-include $(TOP)/../CONFIG.local + +ifdef WITH_COVERAGE USR_CPPFLAGS += --coverage USR_LDFLAGS += --coverage endif @@ -32,7 +23,3 @@ endif INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include -#USR_CPPFLAGS=-fvisibility=hidden - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local