export module makefile variables

hongran · Jul 19, 2018 · 7f036e6 · 7f036e6
1 parent 090ba13
commit 7f036e6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 /dbd/
 /include/
 /lib/
+/cfg/
 O.*/
 html/
 rtf

diff --git a/configure/CONFIG_MRFIOC2_MODULE b/configure/CONFIG_MRFIOC2_MODULE
@@ -0,0 +1,2 @@
+MRFIOC2_MRM_LIBS = evgmrm evrMrm evr mrmShared mrfCommon
+MRFIOC2_MRM_DBDS = evgInit.dbd drvemSupport.dbd
diff --git a/configure/CONFIG_MRFIOC2_VERSION b/configure/CONFIG_MRFIOC2_VERSION
@@ -0,0 +1,3 @@
+MRFIOC2_MAJOR_VERSION = 2
+MRFIOC2_MINOR_VERSION = 2
+MRFIOC2_MAINTENANCE_VERSION = 1
diff --git a/configure/Makefile b/configure/Makefile
@@ -13,5 +13,8 @@ CHECK_RELEASE = YES
 TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
+CFG += CONFIG_MRFIOC2_MODULE
+CFG += CONFIG_MRFIOC2_VERSION
+
 include $(TOP)/configure/RULES
 
diff --git a/mrfCommon/src/Makefile b/mrfCommon/src/Makefile
@@ -6,7 +6,7 @@ USR_CPPFLAGS += -DDEBUG_PRINT
 
 export PERL5LIB=$(EPICS_BASE)/lib/perl
 
-MRF_VERSION = 2.2.1
+MRF_VERSION = $(MRFIOC2_MAJOR_VERSION).$(MRFIOC2_MINOR_VERSION).$(MRFIOC2_MAINTENANCE_VERSION)
 
 #---------------------
 # Install include files

diff --git a/release-checklist.txt b/release-checklist.txt
@@ -1,4 +1,4 @@
 Change version number
   documentation/Doxyfile
   documentation/mainpage.h
-  mrfCommon/src/Makefile
+  configure/CONFIG_MRFIOC2_VERSION
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     /dbd/
     /include/
     /lib/
+    /cfg/
     O.*/
     html/
     rtf
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		MRFIOC2_MRM_LIBS = evgmrm evrMrm evr mrmShared mrfCommon
		MRFIOC2_MRM_DBDS = evgInit.dbd drvemSupport.dbd