Changeset a656da in git


Ignore:
Timestamp:
Feb 24, 2021, 2:19:50 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
29914fb99c60e5dfd7d9cca1951a5ea2c79ed469
Parents:
632e6cc7661b84322e0c7fab35cb3ef6057f4fd0
Message:
Revert "fix: make check"

This reverts commit b37bf4b586b9ab3f935214a738f37a318106ca49.
Location:
libpolys
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libpolys/Makefile.am

    r632e6cc ra656da  
    149149        CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
    150150        CPPFLAGS="-I${abs_top_srcdir} -I${abs_top_builddir} -I${top_srcdir} -I${top_builddir} ${FACTORY_INCLUDES} $(CPPFLAGS_FOR_BUILD) ${USE_P_PROCS_STATIC}" \
    151         LDFLAGS="" LIBS="" p_Procs_Generate${BUILD_EXEEXT}
     151        LDFLAGS="" LIBS="" p_Procs_Generate
    152152        ./p_Procs_Generate$(BUILD_EXEEXT) > ./polys/templates/p_Procs.inc
    153153
     
    155155        perl ${srcdir}/polys/prCopy.pl >  polys/prCopy.inc
    156156
    157 CLEANFILES = $(BUILT_SOURCES) p_Procs_Generate${BUILD_EXEEXT}
     157CLEANFILES = $(BUILT_SOURCES) p_Procs_Generate
    158158
    159159######################################################################
    160160
    161 TESTS = test1 test2
     161TESTS = test
    162162check_PROGRAMS = $(TESTS)
    163163
    164 test1_LDADD=libpolys.la \
     164test_LDADD=libpolys.la \
    165165$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
    166166$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    167167
    168 test1_SOURCES=coeffs/test.cc
    169 
    170 test2_LDADD=libpolys.la \
    171 $(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
    172 $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    173 
    174 test2_SOURCES=polys/test.cc
     168test_SOURCES=test.cc
    175169
    176170gftables: ${top_srcdir}/../factory/gftables
  • libpolys/tests/Makefile.am

    r632e6cc ra656da  
    1818nodist_rings_test_SOURCES = rings_test_runner.cpp
    1919
    20 coeffs_test_LDADD = ${top_builddir}/libpolys.la \
     20coeffs_test_LDADD = ${top_builddir}/coeffs/libcoeffs.la \
     21${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \
    2122$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
    2223$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    2324
    24 simple_test_LDADD = $(coeffs_test_LDADD)
    25 polys_test_LDADD = $(coeffs_test_LDADD)
     25simple_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
     26polys_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
    2627rings_test_LDADD = $(polys_test_LDADD)
    2728
     
    3334
    3435MOD:
    35         if [ -d "${top_builddir}/libpolys/.libs" ]; then \
    36           ln -snf ${top_builddir}/libpolys/.libs/ ${abs_builddir}/MOD; \
     36        if [ -d "${top_builddir}/libpolys/polys/.libs" ]; then \
     37          ln -snf ${top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD; \
    3738        fi
    3839
Note: See TracChangeset for help on using the changeset viewer.