From 736f7c3ff3024d07a49a22ab485b4cee7af81227 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 6 Dec 2017 22:35:54 -0600 Subject: [PATCH] Move EPICS_BASE_PVA_CORE_LIBS to new cfg/CONFIG_PVACCESS_MODULE file ... following the practice of other Base modules. --- configure/CONFIG_PVACCESS_MODULE | 7 +++++++ configure/CONFIG_PVACCESS_VERSION | 2 -- configure/Makefile | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 configure/CONFIG_PVACCESS_MODULE diff --git a/configure/CONFIG_PVACCESS_MODULE b/configure/CONFIG_PVACCESS_MODULE new file mode 100644 index 0000000..4ee8e3f --- /dev/null +++ b/configure/CONFIG_PVACCESS_MODULE @@ -0,0 +1,7 @@ +#************************************************************************* +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# LIbraries needed to link a pvAccess tool +EPICS_BASE_PVA_CORE_LIBS = pvAccessIOC pvAccessCA pvAccess pvData diff --git a/configure/CONFIG_PVACCESS_VERSION b/configure/CONFIG_PVACCESS_VERSION index c95db5f..ea224db 100644 --- a/configure/CONFIG_PVACCESS_VERSION +++ b/configure/CONFIG_PVACCESS_VERSION @@ -1,5 +1,3 @@ -EPICS_BASE_PVA_CORE_LIBS = pvAccessIOC pvAccessCA pvAccess pvData - EPICS_PVA_MAJOR_VERSION = 6 EPICS_PVA_MINOR_VERSION = 0 EPICS_PVA_MAINTENANCE_VERSION = 0 diff --git a/configure/Makefile b/configure/Makefile index 215c533..06756cf 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -1,11 +1,15 @@ +#************************************************************************* +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* TOP=.. include $(TOP)/configure/CONFIG CFG += CONFIG_PVACCESS_VERSION +CFG += CONFIG_PVACCESS_MODULE TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) include $(TOP)/configure/RULES -