Changeset 14fb1bd in git


Ignore:
Timestamp:
Mar 12, 2021, 2:54:33 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
b6d72d85fb5cc2c848447e5dbbf591fa7ddf09eae390b499776822f5f0dfb0f4ffa798ce2d21d8ea
Parents:
acfb434e88755605e6585c20528e02740d41e586f01b1a88506996821debc81b3b3b7968a51fd361
Message:
Merge branch 'mkoeppe-noinst-libgfan' into spielwiese
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/gfanlib/Makefile.am

    racfb434 r14fb1bd  
    4141
    4242if HAVE_GFANLIB
     43# Use objects from the libtool convenience library
    4344 gfanlib_la_LIBADD   += ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
    4445endif
  • gfanlib/Makefile.am

    racfb434 r14fb1bd  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
     3
    34if HAVE_GFANLIB
    4   lib_LTLIBRARIES=libgfan.la
     5# We build libgfan as a libtool convenience library.
     6# It is not installed; instead, its objects will be spliced into the
     7# module Singular/dyn_modules/gfanlib
     8noinst_LTLIBRARIES = libgfan.la
    59endif
    6 
    7 libgfandir = $(libdir)
    810
    911AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
     
    1719SOURCES = 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
    1820libgfan_la_SOURCES = $(SOURCES)
    19 libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS) -release ${PACKAGE_VERSION}
     21libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
    2022
    21 libgfan_includedir =$(includedir)/gfanlib
    22 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
     23noinst_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
    2324
    2425DISTCLEANFILES =  config.h
    25 
    26 moduledir = $(libexecdir)/singular/MOD
Note: See TracChangeset for help on using the changeset viewer.