Changeset ba944c5 in git

Timestamp:

May 31, 2021, 12:01:14 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

7a1f64d75c340aa30ebfdeb25177f59988b1f5dc

Parents:

d817a9fecc788131646a5ae1c82a022e811f42d19931e80616b01b0fc0cd7bc6fc39e341bbca3340

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-05-31 12:01:14+02:00

git-committer:

GitHub <noreply@github.com>2021-05-31 12:01:14+02:00

Message:

Merge pull request #1095 from orlitzky/fix-gfan-linker-flags

gfanlib/Makefile.am: use LIBADD for additional libraries.

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