Changeset b37bf4b in git


Ignore:
Timestamp:
Feb 17, 2021, 10:54:11 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
6993036b12d3795242f9e55fd0dad291a8bfe1e5
Parents:
1f4a6c49f94b09a3b40da3dfe69488fdbb2738e3
Message:
fix: make check
Location:
libpolys
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libpolys/Makefile.am

    r1f4a6c rb37bf4b  
    148148        CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
    149149        CPPFLAGS="-I${abs_top_srcdir} -I${abs_top_builddir} -I${top_srcdir} -I${top_builddir} ${FACTORY_INCLUDES} $(CPPFLAGS_FOR_BUILD) ${USE_P_PROCS_STATIC}" \
    150         LDFLAGS="" LIBS="" p_Procs_Generate
     150        LDFLAGS="" LIBS="" p_Procs_Generate${BUILD_EXEEXT}
    151151        ./p_Procs_Generate$(BUILD_EXEEXT) > ./polys/templates/p_Procs.inc
    152152
     
    154154        perl ${srcdir}/polys/prCopy.pl >  polys/prCopy.inc
    155155
    156 CLEANFILES = $(BUILT_SOURCES) p_Procs_Generate
     156CLEANFILES = $(BUILT_SOURCES) p_Procs_Generate${BUILD_EXEEXT}
    157157
    158158######################################################################
    159159
    160 TESTS = test
     160TESTS = test1 test2
    161161check_PROGRAMS = $(TESTS)
    162162
    163 test_LDADD=libpolys.la \
     163test1_LDADD=libpolys.la \
    164164$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
    165165$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    166166
    167 test_SOURCES=test.cc
     167test1_SOURCES=coeffs/test.cc
     168
     169test2_LDADD=libpolys.la \
     170$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
     171$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
     172
     173test2_SOURCES=polys/test.cc
    168174
    169175gftables: ${top_srcdir}/../factory/gftables
  • libpolys/tests/Makefile.am

    r1f4a6c rb37bf4b  
    1818nodist_rings_test_SOURCES = rings_test_runner.cpp
    1919
    20 coeffs_test_LDADD = ${top_builddir}/coeffs/libcoeffs.la \
    21 ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \
     20coeffs_test_LDADD = ${top_builddir}/libpolys.la \
    2221$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
    2322$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    2423
    25 simple_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
    26 polys_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
     24simple_test_LDADD = $(coeffs_test_LDADD)
     25polys_test_LDADD = $(coeffs_test_LDADD)
    2726rings_test_LDADD = $(polys_test_LDADD)
    2827
     
    3433
    3534MOD:
    36         if [ -d "${top_builddir}/libpolys/polys/.libs" ]; then \
    37           ln -snf ${top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD; \
     35        if [ -d "${top_builddir}/libpolys/.libs" ]; then \
     36          ln -snf ${top_builddir}/libpolys/.libs/ ${abs_builddir}/MOD; \
    3837        fi
    3938
Note: See TracChangeset for help on using the changeset viewer.