Changeset 77054f in git

Timestamp:

Mar 11, 2021, 6:40:28 AM (2 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

0732b5d0bf1071123316c1301d6f92ab2e4cac3a

Parents:

f7951d3b3bfea118917f4155803e30bac0dc2b16

git-author:

Matthias Koeppe <mkoeppe@math.ucdavis.edu>2021-03-10 21:40:28-08:00

git-committer:

Matthias Koeppe <mkoeppe@math.ucdavis.edu>2021-03-10 21:40:53-08:00

Message:

gfanlib/Makefile.am: Build libgfan as a libtool convenience library, do not install library or headers

Files:

• Singular/dyn_modules/gfanlib/Makefile.am (modified) (1 diff)
• gfanlib/Makefile.am (modified) (2 diffs)

Singular/dyn_modules/gfanlib/Makefile.am

@@ -41 +41 @@
 
 if HAVE_GFANLIB
+# Use objects from the libtool convenience library
  gfanlib_la_LIBADD   += ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
 endif

gfanlib/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-if HAVE_GFANLIB
-  lib_LTLIBRARIES=libgfan.la
-endif
-
-libgfandir = $(libdir)
+# We build libgfan as a libtool convenience library.
+# It is not installed; instead, its objects will be spliced into the
+# module Singular/dyn_modules/gfanlib
+noinst_LTLIBRARIES = libgfan.la
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
@@ -17 +16 @@
 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) -release ${PACKAGE_VERSION}
+libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
 
-libgfan_includedir =$(includedir)/gfanlib
-libgfan_include_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
+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
-
-moduledir = $(libexecdir)/singular/MOD