Changeset 8872ef in git

Timestamp:

May 23, 2011, 6:15:06 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

e14941cb3862f30b460fab62e0c485f193ab781a

Parents:

6b61be3f07f87c754ee15d7bb06800f58b963592

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-23 18:15:06+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:48+01:00

Message:

FIX: enable testing without factory

Location:

libpolys

Files:

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

libpolys/coeffs/Makefile.am

@@ -38 +38 @@
 
 
+if ENABLE_FACTORY
+  USE_FACTORY = -L${top_builddir}/../factory
+else
+  USE_FACTORY =
+endif
 
 ## for testing...
-AM_LDFLAGS      = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc -L${top_builddir}/../factory -L${top_builddir}/../omalloc
+AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc
 
-check_PROGRAMS = test test-g
 
-test_SOURCES   = test.cc
-test_g_SOURCES = test.cc
+TESTS = test test-g
+check_PROGRAMS = $(TESTS)
+
+test_SOURCES   = test.cc gftables
+test_g_SOURCES = test.cc gftables
 
 test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc
@@ -61 +68 @@
 test_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
 test_g_CPPFLAGS = -DHAVE_CONFIG_H
+
+gftables: ${top_srcdir}/../factory/gftables
+        ln -snf ${top_srcdir}/../factory/gftables ${builddir}

libpolys/tests/Makefile.am

@@ -1 +1 @@
 CXXTEMPLFLAGS = -O0 --no-exceptions ## -fno-implicit-templates
 
+if ENABLE_FACTORY
+  USE_FACTORY = -L${top_builddir}/../factory
+else
+  USE_FACTORY =
+endif
+
 ## for testing...
-AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc -L${top_builddir}/../factory -L${top_builddir}/../omalloc 
+AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc 
 
 
@@ -18 +24 @@
 check_PROGRAMS = $(TESTS)
 
-simple_test_SOURCES = simple_test_runner.cpp gftables
+simple_test_SOURCES = simple_test_runner.cpp
 coeffs_test_SOURCES = coeffs_test_runner.cpp gftables
 polys_test_SOURCES = polys_test_runner.cpp gftables
 rings_test_SOURCES = rings_test_runner.cpp gftables
+