Changeset 14fb1bd in git

Timestamp:

Mar 12, 2021, 2:54:33 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

b6d72d85fb5cc2c848447e5dbbf591fa7ddf09eae390b499776822f5f0dfb0f4ffa798ce2d21d8ea

Parents:

acfb434e88755605e6585c20528e02740d41e586f01b1a88506996821debc81b3b3b7968a51fd361

Message:

Merge branch 'mkoeppe-noinst-libgfan' into spielwiese

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
+# 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
 endif
-
-libgfandir = $(libdir)
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
@@ -17 +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) -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