[mathic] 55/62: Removed -1.0 from the dependency on memtailor and from the mathic library itself. Not a single person who has seen this scheme appears to have understood what it's about (header versioning), even after extensive explanation in some cases, so the effort necessary to explain this scheme far overshadows the technical advantages.

Wed Apr 1 11:36:24 UTC 2015

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository mathic.

commit 798b51e34f3f1f3e91c4f86a94e4fcdf4c8431eb
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Thu Mar 21 19:57:01 2013 +0100

    Removed -1.0 from the dependency on memtailor and from the mathic library itself. Not a single person who has seen this scheme appears to have understood what it's about (header versioning), even after extensive explanation in some cases, so the effort necessary to explain this scheme far overshadows the technical advantages.
---
 Makefile.am                  | 22 +++++++++++-----------
 build/autotools/mathic.pc.in |  4 ++--
 configure.ac                 | 10 ++--------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a3ee648..4f83320 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,22 +4,22 @@ ACLOCAL_AMFLAGS = -I build/autotools/m4
 
 # Options passed to the C PreProcessor (CPP), NOT the C Plus Plus compiler.
 AM_CPPFLAGS = -I${top_srcdir}/
-libmathic_ at MATHIC_API_VERSION@_la_CPPFLAGS = $(DEPS_CFLAGS)
+libmathic_la_CPPFLAGS = $(DEPS_CFLAGS)
 
 # tell Libtool what the name of the library is.
-lib_LTLIBRARIES = libmathic- at MATHIC_API_VERSION@.la
+lib_LTLIBRARIES = libmathic.la
 
 # set the C++ compiler to include src/
 AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++0x
 
 # set the linker flags to build libmathic
-#libmathic_ at MATHIC_API_VERSION@_la_LDFLAGS =
+#libmathic_la_LDFLAGS =
 
 # libraries that are needed by this library
-libmathic_ at MATHIC_API_VERSION@_la_LIBADD= $(DEPS_LIBS)
+libmathic_la_LIBADD= $(DEPS_LIBS)
 
 # the sources that are built to make libmathic.
-libmathic_ at MATHIC_API_VERSION@_la_SOURCES = src/mathic/Timer.cpp	\
+libmathic_la_SOURCES = src/mathic/Timer.cpp	\
   src/mathic/ColumnPrinter.cpp src/mathic/DivMask.cpp				\
   src/mathic/Action.cpp src/mathic/BoolParameter.cpp				\
   src/mathic/CliParameter.cpp src/mathic/CliParser.cpp				\
@@ -31,10 +31,10 @@ libmathic_ at MATHIC_API_VERSION@_la_SOURCES = src/mathic/Timer.cpp	\
 # Normally, automake strips the path from the files when installing them,
 # so src/mathic/x.h gets installed as just x.h.
 mathicA_include_HEADERS = src/mathic.h
-mathicA_includedir = $(includedir)/mathic-$(MATHIC_API_VERSION)
+mathicA_includedir = $(includedir)/mathic
 # install remaining headers into subdirectory of the include dir
 mathicB_includedir = \
-  $(includedir)/mathic-$(MATHIC_API_VERSION)/mathic
+  $(includedir)/mathic/mathic
 mathicB_include_HEADERS = src/mathic/Action.h src/mathic/Geobucket.h	\
   src/mathic/BinaryKDTree.h src/mathic/GeoFront.h						\
   src/mathic/BoolParameter.h src/mathic/Heap.h							\
@@ -52,7 +52,7 @@ mathicB_include_HEADERS = src/mathic/Action.h src/mathic/Geobucket.h	\
   src/mathic/HashTable.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = build/autotools/mathic-$(MATHIC_API_VERSION).pc
+pkgconfig_DATA = build/autotools/mathic.pc
 
 # When making a distribution file, Automake knows to include all files
 # that are necessary to build the project. EXTRA_DIST specifies files
@@ -69,7 +69,7 @@ divsim_SOURCES = src/divsim/divMain.cpp src/divsim/Simulation.cpp		\
   src/divsim/DivListModel.h src/divsim/KDTreeModel.h					\
   src/divsim/Simulation.h src/divsim/divMain.h src/divsim/Monomial.h	\
   src/divsim/stdinc.h
-divsim_LDADD = $(top_builddir)/libmathic-$(MATHIC_API_VERSION).la
+divsim_LDADD = $(top_builddir)/libmathic.la
 
 # set up the priority queue simulation. Listing the headers in sources
 # ensure that those files are included in distributions.
@@ -79,7 +79,7 @@ pqsim_SOURCES = src/pqsim/Item.cpp src/pqsim/Model.cpp				\
   src/pqsim/GeobucketModel.h src/pqsim/Model.h src/pqsim/stdinc.h	\
   src/pqsim/HeapModel.h src/pqsim/pqMain.h src/pqsim/StlSetModel.h	\
   src/pqsim/Item.h src/pqsim/Simulator.h src/pqsim/TourTreeModel.h
-pqsim_LDADD = $(top_builddir)/libmathic-$(MATHIC_API_VERSION).la
+pqsim_LDADD = $(top_builddir)/libmathic.la
 
 
 # set up tests to run on "make check"
@@ -91,7 +91,7 @@ check_PROGRAMS=$(TESTS)
 unittest_CPPFLAGS = $(DEPS_CFLAGS)
 unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x
 unittest_LDADD = $(DEPS_LIBS)
-unittest_LDFLAGS= $(top_builddir)/libmathic-$(MATHIC_API_VERSION).la
+unittest_LDFLAGS= $(top_builddir)/libmathic.la
 
 test_LIBS=
 unittest_SOURCES=src/test/DivFinder.cpp src/test/gtestInclude.cpp	\
diff --git a/build/autotools/mathic.pc.in b/build/autotools/mathic.pc.in
index 07b91c4..79559bb 100755
--- a/build/autotools/mathic.pc.in
+++ b/build/autotools/mathic.pc.in
@@ -8,5 +8,5 @@ Description: C++ library of symbolic algebra data structures for use in Groebner
 URL: https://github.com/broune/mathic
 Requires: memtailor-1.0
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lmathic- at MATHIC_API_VERSION@
-Cflags: -I${includedir}/mathic- at MATHIC_API_VERSION@/
+Libs: -L${libdir} -lmathic
+Cflags: -I${includedir}/mathic/
diff --git a/configure.ac b/configure.ac
index 841453a..da428a3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl AC_INIT sets up autoconf and must be first macro.
 AC_INIT([mathic], [1.0]) # package, version, bug-report-email
 
 # Check that memtailor is installed and locate it
-PKG_CHECK_MODULES([MEMTAILOR], [memtailor-1.0])
+PKG_CHECK_MODULES([MEMTAILOR], [memtailor])
 
 dnl ----- The gtest dependency
 
@@ -119,16 +119,10 @@ dnl source and binary interface of the library and is not the same as the
 dnl version of the project.
 AC_SUBST([MATHIC_SO_VERSION], [0:0:0])
 
-dnl Set the version displayed in the pkg-config file. This is currently
-dnl the same as the version of the project but it is possible that
-dnl for example the project will gain a version like x.y.z but that
-dnl the pkg-config file is only named as foo-x.y.pc (no z).
-AC_SUBST([MATHIC_API_VERSION], [1.0])
-
 dnl Set up AC_OUTPUT to create each file by copying an input file
 dnl while substituting the output variable values.
 AC_CONFIG_FILES([Makefile
-  build/autotools/mathic-${MATHIC_API_VERSION}.pc:build/autotools/mathic.pc.in])
+  build/autotools/mathic.pc:build/autotools/mathic.pc.in])
 
 dnl Macro that is required to be at the end of any Autoconf script.
 dnl Creates config.status and launches it.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git

