From 705149b86a80dd8b53fa8c1717872e9b2e9dbbcb Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 30 May 2021 08:10:10 -0400 Subject: [PATCH 1/3] gfanlib/Makefile.am: use LIBADD for additional libraries. The $GMP_LIBS and $CDDGMPLDFLAGS variables were being added to libgfan_la_LDFLAGS, which isn't quite correct. Since both contain library (-l) flags, they belong in _LIBADD rather than _LDFLAGS: https://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html This commit moves them to a new libgfan_la_LIBADD variable. --- gfanlib/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am index cec8d8f..96e1893 100644 --- a/gfanlib/Makefile.am +++ b/gfanlib/Makefile.am @@ -18,9 +18,13 @@ AM_CXXFLAGS = @CXX11_FLAG@ SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp libgfan_la_SOURCES = $(SOURCES) -libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS) +libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) libgfan_la_CPPFLAGS= $(GMP_CPPFLAGS) $(CDDGMPCPPFLAGS) +# Despite the naming convention, $CDDGMPLDFLAGS contains "-lcddgmp" +# and the rest of the $GMP_LIBS flags. +libgfan_la_LIBADD = $(CDDGMPLDFLAGS) $(GMP_LIBS) + noinst_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h DISTCLEANFILES = config.h -- 2.31.1