[mathicgb] 02/14: 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 upstream
in repository mathicgb.

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

    remove libtool; stop building sharable libraries
---
 Makefile.am  | 11 ++++-------
 configure.ac |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4102169..cb4bf89 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,14 +6,11 @@ ACLOCAL_AMFLAGS = -I build/autotools/m4
 AM_CPPFLAGS = -I${top_srcdir}/ -I$(top_srcdir)/src/ $(DEPS_CFLAGS)
 
 # tell Libtool what the name of the library is.
-lib_LTLIBRARIES = libmathicgb.la
-
-# libraries that are needed by this library
-libmathicgb_la_LIBADD= $(DEPS_LIBS)
+lib_LIBRARIES = libmathicgb.a
 
 # the sources that are built to make libmathicgb. Listing the headers in
 # sources ensure that those files are included in distributions.
-libmathicgb_la_SOURCES = src/mathicgb/MonoArena.hpp						\
+libmathicgb_a_SOURCES = src/mathicgb/MonoArena.hpp						\
   src/mathicgb/Range.hpp src/mathicgb/ReducerPack.hpp					\
   src/mathicgb/ReducerPack.cpp src/mathicgb/ClassicGBAlg.cpp			\
   src/mathicgb/ClassicGBAlg.hpp src/mathicgb/MonoLookup.hpp				\
@@ -85,7 +82,7 @@ mgb_SOURCES = src/cli/GBMain.cpp src/cli/CommonParams.hpp		\
   src/cli/MatrixAction.cpp src/cli/MatrixAction.hpp			\
   src/cli/SigGBAction.hpp src/cli/SigGBAction.cpp			\
   src/cli/HelpAction.hpp src/cli/HelpAction.cpp
-mgb_LDADD = $(top_builddir)/libmathicgb.la $(DEPS_LIBS)
+mgb_LDADD = $(top_builddir)/libmathicgb.a $(DEPS_LIBS)
 
 # set up tests to run on "make check"
 if with_gtest
@@ -93,7 +90,7 @@ if with_gtest
 TESTS=unittest
 check_PROGRAMS=$(TESTS)
 
-unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.la
+unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.a $(DEPS_LIBS)
 
 test_LIBS=
 unittest_SOURCES=src/test/Range.cpp src/test/gtestInclude.cpp			\
diff --git a/configure.ac b/configure.ac
index 3e5c01f..6b6590c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -174,9 +174,7 @@ AC_PROG_LN_S
 # Requires install-sh to be present as a fallback, even on systems where
 # the fallback is not used.
 AC_PROG_INSTALL
-
-# 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
@@ -185,8 +183,7 @@ 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
-  build/autotools/mathicgb.pc:build/autotools/mathicgb.pc.in])
+AC_CONFIG_FILES([Makefile build/autotools/mathicgb.pc])
 
 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