Changeset b37bf4b in git

Timestamp:

Feb 17, 2021, 10:54:11 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6993036b12d3795242f9e55fd0dad291a8bfe1e5

Parents:

1f4a6c49f94b09a3b40da3dfe69488fdbb2738e3

Message:

fix: make check

Location:

libpolys

Files:

• Makefile.am (modified) (2 diffs)
• tests/Makefile.am (modified) (2 diffs)

libpolys/Makefile.am

@@ -148 +148 @@
         CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
         CPPFLAGS="-I${abs_top_srcdir} -I${abs_top_builddir} -I${top_srcdir} -I${top_builddir} ${FACTORY_INCLUDES} $(CPPFLAGS_FOR_BUILD) ${USE_P_PROCS_STATIC}" \
-        LDFLAGS="" LIBS="" p_Procs_Generate
+        LDFLAGS="" LIBS="" p_Procs_Generate${BUILD_EXEEXT}
         ./p_Procs_Generate$(BUILD_EXEEXT) > ./polys/templates/p_Procs.inc
 
@@ -154 +154 @@
         perl ${srcdir}/polys/prCopy.pl >  polys/prCopy.inc
 
-CLEANFILES = $(BUILT_SOURCES) p_Procs_Generate
+CLEANFILES = $(BUILT_SOURCES) p_Procs_Generate${BUILD_EXEEXT}
 
 ######################################################################
 
-TESTS = test
+TESTS = test1 test2
 check_PROGRAMS = $(TESTS)
 
-test_LDADD=libpolys.la \
+test1_LDADD=libpolys.la \
 $(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
 $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
 
-test_SOURCES=test.cc
+test1_SOURCES=coeffs/test.cc
+
+test2_LDADD=libpolys.la \
+$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
+$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
+
+test2_SOURCES=polys/test.cc
 
 gftables: ${top_srcdir}/../factory/gftables

libpolys/tests/Makefile.am

@@ -18 +18 @@
 nodist_rings_test_SOURCES = rings_test_runner.cpp
 
-coeffs_test_LDADD = ${top_builddir}/coeffs/libcoeffs.la \
-${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \
+coeffs_test_LDADD = ${top_builddir}/libpolys.la \
 $(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
 $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
 
-simple_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
-polys_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
+simple_test_LDADD = $(coeffs_test_LDADD)
+polys_test_LDADD = $(coeffs_test_LDADD)
 rings_test_LDADD = $(polys_test_LDADD)
 
@@ -34 +33 @@
 
 MOD:
-        if [ -d "${top_builddir}/libpolys/polys/.libs" ]; then \
-          ln -snf ${top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD; \
+        if [ -d "${top_builddir}/libpolys/.libs" ]; then \
+          ln -snf ${top_builddir}/libpolys/.libs/ ${abs_builddir}/MOD; \
         fi