cleanup

incity · Nov 1, 2017 · 4f49f76 · 4f49f76
1 parent 2a1aaa0
commit 4f49f76
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,7 +136,6 @@ set (prefix ${CMAKE_INSTALL_PREFIX})
 set (exec_prefix "\${prefix}")
 set (libdir "\${exec_prefix}/lib")
 set (includedir "\${prefix}/include")
-set (mGPlus_VERSION ${MGPLUS_VERSION})
 configure_file(
     "${PROJECT_SOURCE_DIR}/mgplus.pc.in"
     "${PROJECT_BINARY_DIR}/${MGPLUS_NAME}.pc")

diff --git a/configure.ac b/configure.ac
@@ -4,39 +4,51 @@ AC_PREREQ(2.60)
 AC_INIT(libmgplus, 1.2.5)
 AC_CONFIG_SRCDIR(src/agg/agg_platform_support.cpp)
 
-mGPlus_MAJOR_VERSION=1
-mGPlus_MINOR_VERSION=2
-mGPlus_MICRO_VERSION=5
-mGPlus_INTERFACE_AGE=0
-mGPlus_BINARY_AGE=0
-mGPlus_VERSION=$mGPlus_MAJOR_VERSION.$mGPlus_MINOR_VERSION.$mGPlus_MICRO_VERSION
-
-AC_SUBST(mGPlus_MAJOR_VERSION)
-AC_SUBST(mGPlus_MINOR_VERSION)
-AC_SUBST(mGPlus_MICRO_VERSION)
-AC_SUBST(mGPlus_INTERFACE_AGE)
-AC_SUBST(mGPlus_BINARY_AGE)
-AC_SUBST(mGPlus_VERSION)
+dnl Set various version strings
+#
+# Making releases:
+# Change the version, then:
+#   _MICRO_VERSION += 1;
+#   _INTERFACE_AGE += 1;
+#   _BINARY_AGE += 1;
+# if any functions have been added, set _INTERFACE_AGE to 0.
+# if backwards compatibility has been broken,
+# set _BINARY_AGE and _INTERFACE_AGE to 0.
+#
+MGPLUS_MAJOR_VERSION=1
+MGPLUS_MINOR_VERSION=2
+MGPLUS_MICRO_VERSION=5
+MGPLUS_INTERFACE_AGE=0
+MGPLUS_BINARY_AGE=0
+MGPLUS_VERSION=$MGPLUS_MAJOR_VERSION.$MGPLUS_MINOR_VERSION.$MGPLUS_MICRO_VERSION
+
+AC_SUBST(MGPLUS_MAJOR_VERSION)
+AC_SUBST(MGPLUS_MINOR_VERSION)
+AC_SUBST(MGPLUS_MICRO_VERSION)
+AC_SUBST(MGPLUS_INTERFACE_AGE)
+AC_SUBST(MGPLUS_BINARY_AGE)
+AC_SUBST(MGPLUS_VERSION)
+
 # libtool versioning
-LT_RELEASE=$mGPlus_MAJOR_VERSION.$mGPlus_MINOR_VERSION.$mGPlus_MICRO_VERSION
-LT_CURRENT=`expr $mGPlus_MICRO_VERSION - $mGPlus_INTERFACE_AGE`
-LT_REVISION=$mGPlus_INTERFACE_AGE
-LT_AGE=`expr $mGPlus_BINARY_AGE - $mGPlus_INTERFACE_AGE`
+LT_RELEASE=$MGPLUS_MAJOR_VERSION.$MGPLUS_MINOR_VERSION
+LT_CURRENT=`expr $MGPLUS_MICRO_VERSION - $MGPLUS_INTERFACE_AGE`
+LT_REVISION=$MGPLUS_INTERFACE_AGE
+LT_AGE=`expr $MGPLUS_BINARY_AGE - $MGPLUS_INTERFACE_AGE`
 
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-AC_DEFINE_UNQUOTED(MGPLUS_MAJOR_VERSION, $mGPlus_MAJOR_VERSION,
+AC_DEFINE_UNQUOTED(MGPLUS_MAJOR_VERSION, $MGPLUS_MAJOR_VERSION,
             [Major version of mGPlus])
-AC_DEFINE_UNQUOTED(MGPLUS_MINOR_VERSION, $mGPlus_MINOR_VERSION,
+AC_DEFINE_UNQUOTED(MGPLUS_MINOR_VERSION, $MGPLUS_MINOR_VERSION,
             [Minor version of mGPlus])
-AC_DEFINE_UNQUOTED(MGPLUS_MICRO_VERSION, $mGPlus_MICRO_VERSION,
+AC_DEFINE_UNQUOTED(MGPLUS_MICRO_VERSION, $MGPLUS_MICRO_VERSION,
             [Micro version of mGPlus])
-AC_DEFINE_UNQUOTED(MGPLUS_INTERFACE_AGE, $mGPlus_INTERFACE_AGE,
+AC_DEFINE_UNQUOTED(MGPLUS_INTERFACE_AGE, $MGPLUS_INTERFACE_AGE,
             [Interface age of mGPlus])
-AC_DEFINE_UNQUOTED(MGPLUS_BINARY_AGE, $mGPlus_BINARY_AGE,
+AC_DEFINE_UNQUOTED(MGPLUS_BINARY_AGE, $MGPLUS_BINARY_AGE,
             [Binary age of mGPlus])
 
 dnl ========================================================================

diff --git a/include/mgplus.h b/include/mgplus.h
@@ -40,6 +40,8 @@ extern "C" {
 #      include "../mgplusconfig.h"
 #  else
 #    include "mgplusconfig.h"
+#    undef PACKAGE
+#    undef VERSION
 #    undef PACKAGE_BUGREPORT
 #    undef PACKAGE_NAME
 #    undef PACKAGE_STRING

diff --git a/mgplus.pc.in b/mgplus.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: mGPlus
 Description: A MiniGUI component which provides support for advanced 2D graphics functions.
-Version: @mGPlus_VERSION@
+Version: @MGPLUS_VERSION@
 Requires:
 Libs: -L${libdir} -lmgplus@LIB_SUFFIX@ @PC_LIBS@
 Libs.private: