[mathic] 03/30: remove libtool; stop building sharable libraries

[Doug Torrance]

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

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

commit 8decf5ce89e1e8f582787f3f8e2b3f605fe07aee
Author: Daniel R. Grayson <dan at math.uiuc.edu>
Date:   Mon Sep 22 20:49:43 2014 -0500

    remove libtool; stop building sharable libraries
---
 Makefile.am  | 18 +++++++-----------
 configure.ac |  5 ++---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 08b94d1..68e3ebd 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,19 +4,16 @@ ACLOCAL_AMFLAGS = -I build/autotools/m4
 
 # Options passed to the C and C++ PreProcessor (CPP) and compiler
 AM_CPPFLAGS = -I${top_srcdir}/
-libmathic_la_CPPFLAGS = $(DEPS_CFLAGS)
+libmathic_a_CPPFLAGS = $(DEPS_CFLAGS)
 
 # tell Libtool what the name of the library is.
-lib_LTLIBRARIES = libmathic.la
+lib_LIBRARIES = libmathic.a
 
 # set the C++ compiler to include src/
 AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++0x
 
-# libraries that are needed by this library
-libmathic_la_LIBADD= $(DEPS_LIBS)
-
 # the sources that are built to make libmathic.
-libmathic_la_SOURCES = src/mathic/Timer.cpp	\
+libmathic_a_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				\
@@ -66,7 +63,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.la
+divsim_LDADD = $(top_builddir)/libmathic.a
 
 # set up the priority queue simulation. Listing the headers in sources
 # ensure that those files are included in distributions.
@@ -76,7 +73,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.la
+pqsim_LDADD = $(top_builddir)/libmathic.a
 
 
 # set up tests to run on "make check"
@@ -85,10 +82,9 @@ if with_gtest
 TESTS=unittest
 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.la
+unittest_LDADD = $(top_builddir)/libmathic.a $(DEPS_LIBS)
+unittest_CPPFLAGS = $(DEPS_CFLAGS)
 
 test_LIBS=
 unittest_SOURCES=src/test/DivFinder.cpp src/test/gtestInclude.cpp	\
diff --git a/configure.ac b/configure.ac
index a38cfb6..24f3f63 100755
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AS_IF([test "x$with_gtest" == "xdownload"],
   [AC_MSG_ERROR([invalid value $with_gtest for with_gtest.])]
 )
 AS_IF([test "x$with_gtest" == "xyes"],
-  [GTEST_CFLAGS="-I$GTEST_PATH/include -I$GTEST_PATH"]);
+  [CPPFLAGS="-I$GTEST_PATH/include -I$GTEST_PATH $CPPFLAGS"]);
 AM_CONDITIONAL(with_gtest, test "x$with_gtest" == "xyes")
 
 DEPS_CFLAGS="$MEMTAILOR_CFLAGS $GTEST_CFLAGS"
@@ -114,8 +114,7 @@ AC_PROG_INSTALL
 # Locate the C++ compiler.
 AC_PROG_CXX
 
-# Set up LibTool
-LT_INIT
+AC_PROG_RANLIB
 
 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

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