Changeset 9931e8 in git for gfanlib

Timestamp:

May 30, 2021, 2:10:10 PM (3 years ago)

Author:

Michael Orlitzky <michael@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ba944c5c487bddb2c4551977c3792a5bb1ca34bb

Parents:

d817a9fecc788131646a5ae1c82a022e811f42d1

git-author:

Michael Orlitzky <michael@orlitzky.com>2021-05-30 08:10:10-04:00

git-committer:

Michael Orlitzky <michael@orlitzky.com>2021-05-30 10:20:09-04:00

Message:

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.

File:

• gfanlib/Makefile.am (modified) (1 diff)

gfanlib/Makefile.am

@@ -19 +19 @@
 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