diff --git a/.gitignore b/.gitignore index 5430c36..b4ffe99 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ include/ db/ dbd/ html/ +cfg/ envPaths configure/*.local !configure/ExampleRELEASE.local diff --git a/configure/CONFIG_PVA_CORE b/configure/CONFIG_PVA_CORE new file mode 100644 index 0000000..c95db5f --- /dev/null +++ b/configure/CONFIG_PVA_CORE @@ -0,0 +1,6 @@ +EPICS_BASE_PVA_CORE_LIBS = pvAccessIOC pvAccessCA pvAccess pvData + +EPICS_PVA_MAJOR_VERSION = 6 +EPICS_PVA_MINOR_VERSION = 0 +EPICS_PVA_MAINTENANCE_VERSION = 0 +EPICS_PVA_DEVELOPMENT_FLAG = 1 diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 61909e9..40db1d7 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -23,13 +23,6 @@ CHECK_RELEASE = YES -include $(TOP)/../CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local -EPICS_PVA_MAJOR_VERSION = 6 -EPICS_PVA_MINOR_VERSION = 0 -EPICS_PVA_MAINTENANCE_VERSION = 0 -EPICS_PVA_DEVELOPMENT_FLAG = 1 - -SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION) - ifdef WITH_COVERAGE USR_CPPFLAGS += --coverage USR_LDFLAGS += --coverage diff --git a/configure/Makefile b/configure/Makefile index aefe673..97b9fcf 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -2,6 +2,8 @@ TOP=.. include $(TOP)/configure/CONFIG +CFG += CONFIG_PVA_CORE + TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) diff --git a/src/Makefile b/src/Makefile index 93b2604..0acbdaf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,6 +32,8 @@ ifdef WITH_MICROBENCH endif LIB_LIBS += Com +SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION) + # needed for Windows LIB_SYS_LIBS_WIN32 += ws2_32 diff --git a/src/ca/Makefile b/src/ca/Makefile index 640dd40..a7a9c79 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -8,6 +8,8 @@ ifdef WITH_MICROBENCH endif LIB_LIBS += Com +SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION) + # needed for Windows LIB_SYS_LIBS_WIN32 += ws2_32 diff --git a/src/ioc/Makefile b/src/ioc/Makefile index 16b1349..1406613 100644 --- a/src/ioc/Makefile +++ b/src/ioc/Makefile @@ -6,6 +6,8 @@ LIBRARY += pvAccessIOC pvAccessIOC_LIBS += pvAccess pvData pvAccessIOC_LIBS += $(EPICS_BASE_IOC_LIBS) +SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION) + INC += pv/syncChannelFind.h INC += pv/iocshelper.h