[mathicgb] 200/393: MathicGB now also installs itself as a header+library in addition to as a console program.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 039253c4e4a910cd291a9b3392c5aa490c292573
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Thu Mar 21 21:05:21 2013 +0100

    MathicGB now also installs itself as a header+library in addition to as a console program.
---
 Makefile.am  | 22 ++++++++++++++++------
 configure.ac | 14 ++++++++++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 252a3fe..f3f66ca 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,10 @@ AM_CPPFLAGS = -I${top_srcdir}/
 libmathicgb_la_CPPFLAGS = $(DEPS_CFLAGS)
 
 # tell Libtool what the name of the library is.
-noinst_LTLIBRARIES = libmathicgb.la
+lib_LTLIBRARIES = libmathicgb.la
 
 # set the C++ compiler to include src/
 AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++0x
-AM_LDFLAGS=
 
 # libraries that are needed by this library
 libmathicgb_la_LIBADD= $(DEPS_LIBS)
@@ -71,6 +70,16 @@ libmathicgb_la_SOURCES = src/mathicgb/BjarkeGeobucket2.cpp		\
   src/mathicgb/F4MatrixProjection.cpp src/mathicgb/ScopeExit.hpp \
   src/mathicgb.cpp src/mathicgb.h src/mathicgb/mtbb.hpp
 
+
+# The headers that libmathicgb installs.
+mathicgbA_include_HEADERS = src/mathicgb.h
+mathicgbA_includedir = $(includedir)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = build/autotools/mathicgb.pc
+
+
+
 # When making a distribution file, Automake knows to include all files
 # that are necessary to build the project. EXTRA_DIST specifies files
 # to include beyond those used in the build process.
@@ -78,8 +87,8 @@ EXTRA_DIST = autogen.sh
 
 bin_PROGRAMS = mgb
 
-# set up the tests. Listing the headers in sources ensure that those
-# files are included in distributions.
+# set up the console program. Listing the headers in sources ensure that
+# those files are included in distributions.
 mgb_CPPFLAGS = $(DEPS_CFLAGS)
 mgb_SOURCES = src/cli/GBMain.cpp src/cli/CommonParams.hpp				\
   src/cli/CommonParams.cpp src/cli/GBAction.hpp src/cli/GBAction.cpp	\
@@ -96,8 +105,9 @@ TESTS=unittest
 check_PROGRAMS=$(TESTS)
 
 unittest_CPPFLAGS = $(DEPS_CFLAGS)
-unittest_CXXFLAGS= -I$(top_srcdir)/src/ -std=gnu++0x
-unittest_LDADD = $(DEPS_LIBS) libmathicgb.la $(DEPS_LIBS)
+unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x
+unittest_LDADD = $(DEPS_LIBS)
+unittest_LDFLAGS= $(top_builddir)/libmathicgb.la
 
 test_LIBS=
 unittest_SOURCES=src/test/FreeModuleOrderTest.cpp						\
diff --git a/configure.ac b/configure.ac
index c4c3fb5..1caae31 100755
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AS_IF([test "x$with_gtest" == "xdownload"],
     (
       cd $GTEST_PATH;
       rm -rf gtest-$GTEST_VERSION.zip
-      wget http://googletest.googlfecode.com/files/gtest-$GTEST_VERSION.zip;
+      wget http://googletest.googlecode.com/files/gtest-$GTEST_VERSION.zip;
       unzip gtest-$GTEST_VERSION.zip;
       rm gtest-$GTEST_VERSION.zip
       rm -rf gtest/
@@ -86,9 +86,9 @@ AC_CONFIG_AUX_DIR([build/autotools]) # directory for auxiliary build tools (inst
 # check that source directory is correct
 dnl  if autoconf is told the source code is in a directory that does not
 dnl  contain this file then it knows that the directory is wrong.
-AC_CONFIG_SRCDIR([src/cli/GBMain.cpp])
+AC_CONFIG_SRCDIR([src/mathicgb.h])
 
-# Enable maintainer mode
+# Enable optional maintainer mode (off by default)
 dnl AM_MAINTAINER_MODE turns off automatic reconstruction of the build
 dnl files if the source build files have changed. A developer will want
 dnl those automatic reconstructions to happen so that changes to the
@@ -134,9 +134,15 @@ AC_PROG_CXX
 # Set up LibTool
 LT_INIT
 
+dnl Set the version for the library -- this concerns compatibility of the
+dnl source and binary interface of the library and is not the same as the
+dnl version of the project.
+AC_SUBST([MATHICGB_SO_VERSION], [0:0: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])
+AC_CONFIG_FILES([Makefile
+  build/autotools/mathicgb.pc:build/autotools/mathicgb.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/mathicgb.git