Changeset d459ab in git


Ignore:
Timestamp:
Mar 11, 2024, 9:37:36 AM (7 weeks ago)
Author:
Michael Orlitzky <michael@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
ae39460c5fa2a195f50c59b3ca31f128f907e44c
Parents:
45eca675525f9188a5fb3c1070657a0f5cf2d81f
git-author:
Michael Orlitzky <michael@orlitzky.com>2024-03-11 04:37:36-04:00
git-committer:
GitHub <noreply@github.com>2024-03-11 09:37:36+01:00
Message:
**/Makefile.am: links tests with RESOURCES_LIBS (#1211)

Several test programs use functions from libsingular_resources, such
as feInitResources(). Here we ensure that those test programs are
actually linked with libsingular_resources by adding RESOURCES_LIBS to
the corresponding LDADD lines. In the process, and for consistency, we
have replaced some references to libomalloc.la with OMALLOC_LIBS.
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r45eca6 rd459ab  
    163163ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
    164164${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
    165 ${top_builddir}/resources/libsingular_resources.la
     165$(RESOURCES_LIBS)
    166166
    167167
    … …  
    172172TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
    173173${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
    174 ${top_builddir}/resources/libsingular_resources.la
     174$(RESOURCES_LIBS)
    175175
    176176TSingular_SOURCES = emacs.cc feOptTS.inc feOpt.cc
    … …  
    214214
    215215test_SOURCES = test.cc
    216 test_LDADD = ${builddir}/../omalloc/libomalloc.la libSingular.la
     216test_LDADD = $(OMALLOC_LIBS) libSingular.la $(RESOURCES_LIBS)
    217217
    218218#########################################################

  • kernel/GBEngine/Makefile.am

    r45eca6 rd459ab  
    2222check_PROGRAMS = $(TESTS)
    2323test_SOURCES = test.cc
    24 test_LDADD   = libGBEngine.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la  ${builddir}/../../Singular/libSingular.la
     24test_LDADD   = libGBEngine.la $(OMALLOC_LIBS) ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la  ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2525
    2626CLEANFILES = $(TESTS)

  • kernel/Makefile.am

    r45eca6 rd459ab  
    5252
    5353test_SOURCES = test.cc
    54 test_LDADD   = libkernel.la ${builddir}/../omalloc/libomalloc.la ${builddir}/../Singular/libSingular.la
     54test_LDADD   = libkernel.la $(OMALLOC_LIBS) ${builddir}/../Singular/libSingular.la $(RESOURCES_LIBS)
    5555
    5656# These files are built first

  • kernel/combinatorics/Makefile.am

    r45eca6 rd459ab  
    1818check_PROGRAMS = $(TESTS)
    1919test_SOURCES = test.cc
    20 test_LDADD   = libcombinatorics.la ${builddir}/../libkernelCommon.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     20test_LDADD   = libcombinatorics.la ${builddir}/../libkernelCommon.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2121
    2222CLEANFILES = $(TESTS)

  • kernel/fglm/Makefile.am

    r45eca6 rd459ab  
    1818check_PROGRAMS = $(TESTS)
    1919test_SOURCES = test.cc
    20 test_LDADD   = libfglm.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     20test_LDADD   = libfglm.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2121
    2222CLEANFILES = $(TESTS)

  • kernel/groebner_walk/Makefile.am

    r45eca6 rd459ab  
    1818check_PROGRAMS = $(TESTS)
    1919test_SOURCES = test.cc
    20 test_LDADD   = libgroebner_walk.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     20test_LDADD   = libgroebner_walk.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2121
    2222CLEANFILES = $(TESTS)

  • kernel/linear_algebra/Makefile.am

    r45eca6 rd459ab  
    2424check_PROGRAMS = $(TESTS)
    2525test_SOURCES = test.cc
    26 test_LDADD   = liblinear_algebra.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     26test_LDADD   = liblinear_algebra.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2727
    2828CLEANFILES = $(TESTS)

  • kernel/maps/Makefile.am

    r45eca6 rd459ab  
    1818check_PROGRAMS = $(TESTS)
    1919test_SOURCES = test.cc
    20 test_LDADD   = libmaps.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     20test_LDADD   = libmaps.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2121
    2222CLEANFILES = $(TESTS)

  • kernel/numeric/Makefile.am

    r45eca6 rd459ab  
    1919check_PROGRAMS = $(TESTS)
    2020test_SOURCES = test.cc
    21 test_LDADD   = libnumeric.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     21test_LDADD   = libnumeric.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2222
    2323CLEANFILES = $(TESTS)

  • kernel/oswrapper/Makefile.am

    r45eca6 rd459ab  
    2020check_PROGRAMS = $(TESTS)
    2121test_SOURCES = test.cc
    22 test_LDADD   = liboswrapper.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     22test_LDADD   = liboswrapper.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2323
    2424CLEANFILES = $(TESTS)

  • kernel/spectrum/Makefile.am

    r45eca6 rd459ab  
    1818check_PROGRAMS = $(TESTS)
    1919test_SOURCES = test.cc
    20 test_LDADD   = libspectrum.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
     20test_LDADD   = libspectrum.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
    2121
    2222CLEANFILES = $(TESTS)
Note: See TracChangeset for help on using the changeset viewer.