From c6168a74772a93f18facc83631c13db381ff15bb Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 29 Jul 2019 11:14:27 -0500 Subject: [PATCH] New CONFIG_NTYPES_VERSION file, use for SHRLIB_VERSION --- configure/CONFIG_NTYPES_VERSION | 3 +++ configure/Makefile | 2 ++ src/Makefile | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 configure/CONFIG_NTYPES_VERSION diff --git a/configure/CONFIG_NTYPES_VERSION b/configure/CONFIG_NTYPES_VERSION new file mode 100644 index 0000000..0f768b8 --- /dev/null +++ b/configure/CONFIG_NTYPES_VERSION @@ -0,0 +1,3 @@ +EPICS_NTYPES_MAJOR_VERSION = 6 +EPICS_NTYPES_MINOR_VERSION = 0 +EPICS_NTYPES_MAINTENANCE_VERSION = 0 diff --git a/configure/Makefile b/configure/Makefile index ade29a7..64e5914 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -10,6 +10,8 @@ include $(TOP)/configure/CONFIG # but continue the build even if conflicts are found. CHECK_RELEASE = YES +CFG += CONFIG_NTYPES_VERSION + TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) diff --git a/src/Makefile b/src/Makefile index 3d3aadb..47d8e8b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -47,7 +47,7 @@ LIBRARY = nt nt_LIBS += pvData Com # shared library ABI version. -SHRLIB_VERSION ?= 6.0.0 +SHRLIB_VERSION ?= $(EPICS_NTYPES_MAJOR_VERSION).$(EPICS_NTYPES_MINOR_VERSION).$(EPICS_NTYPES_MAINTENANCE_VERSION) include $(TOP)/configure/RULES