From e1773538d235abcf4dae01b4c17d8d7451eaf1a4 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 31 Mar 2014 17:26:15 -0500 Subject: [PATCH] Cleaned up CONFIG_SITE file. Introduced WITH_MICROBENCH and WITH_COVERAGE Make variables that control build options. --- configure/CONFIG_SITE | 45 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 575e348..51f7508 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -1,50 +1,29 @@ # CONFIG_SITE # Make any application-specific changes to the EPICS build -# configuration variables in this file. +# configuration variables in this file. # # Host/target specific settings can be specified in files named -# CONFIG_SITE.$(EPICS_HOST_ARCH).Common -# CONFIG_SITE.Common.$(T_A) -# CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) +# CONFIG_SITE.$(EPICS_HOST_ARCH).Common +# 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 +# If you don't want to install into $(TOP) then +# define INSTALL_LOCATION here +#INSTALL_LOCATION= -# To install files into a location other than $(TOP) define -# INSTALL_LOCATION here. -#INSTALL_LOCATION= +-include $(TOP)/configure/CONFIG_SITE.local +-include $(TOP)/../CONFIG.local -# 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 = - -ifeq ($(EPICS_TEST_COVERAGE),1) +ifdef WITH_COVERAGE USR_CPPFLAGS += --coverage USR_LDFLAGS += --coverage endif -ifeq ($(EPICS_HOST_ARCH),linux-x86) - USR_LDFLAGS += -lpthread -endif - -ifeq ($(EPICS_HOST_ARCH),win32-x86) - USR_SYS_LIBS += ws2_32 -endif - -ifeq ($(EPICS_HOST_ARCH),win32-x86-debug) - USR_SYS_LIBS += ws2_32 +ifdef WITH_MICROBENCH +USR_CPPFLAGS += -DPV_MB endif INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include -#USR_CPPFLAGS += -DPV_MB -g -ggdb - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local