Changeset 3199ac in git

Timestamp:

May 18, 2011, 8:19:31 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

148d3c87069f28064e302e9ab8ccdf358596c84f

Parents:

99ae0c026dcf2240aeab92b95e166bfc5ed46566

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-18 20:19:31+02:00

git-committer:

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

Message:

FIX: "make install" installs factory/gftables
FIX: out of tree building of tests (generation of runner )

Files:

• factory/Makefile.am (modified) (2 diffs)
• libpolys/tests/Makefile.am (modified) (1 diff)

factory/Makefile.am

@@ -190 +190 @@
 gengftables_SOURCES = gengftables-conway.cc
 
-data_DATA = gftables
+gftablesdir=$(datadir)/gftables
+gftables_DATA = gftables/10201 gftables/1024 gftables/10609 gftables/11449 \
+gftables/11881 gftables/121 gftables/12167 gftables/125 gftables/12769 \
+gftables/128 gftables/1331 gftables/1369 gftables/14641 \
+gftables/15625 gftables/16 gftables/16129 gftables/16384 \
+gftables/16807 gftables/1681 gftables/169 gftables/17161 gftables/1849 \
+gftables/18769 gftables/19321 gftables/19683 gftables/2048 \
+gftables/2187 gftables/2197 gftables/2209 gftables/22201 \
+gftables/22801 gftables/2401 gftables/243 gftables/24389 \
+gftables/24649 gftables/25 gftables/256 gftables/26569 gftables/27 \
+gftables/27889 gftables/2809 gftables/28561 gftables/289 \
+gftables/29791 gftables/29929 gftables/3125 gftables/32 gftables/32041 \
+gftables/32761 gftables/32768 gftables/343 gftables/3481 gftables/361 \
+gftables/36481 gftables/3721 gftables/37249 gftables/38809 \
+gftables/39601 gftables/4 gftables/4096 gftables/44521 gftables/4489 \
+gftables/49 gftables/4913 gftables/49729 gftables/5041 \
+gftables/50653 gftables/512 gftables/51529 gftables/52441 gftables/529 \
+gftables/5329 gftables/54289 gftables/57121 gftables/58081 \
+gftables/59049 gftables/6241 gftables/625 gftables/63001 \
+gftables/64 gftables/6561 gftables/6859 gftables/6889 gftables/729 \
+gftables/7921 gftables/8 gftables/81 gftables/8192 gftables/841 \
+gftables/9 gftables/9409 gftables/961 
+
+
 
 gftables:       gengftables
@@ -263 +286 @@
                 examples/factorize.cc examples/gcd.cc \
                 bin/folding.el bin/fold-docu.el \
-                bin/makeheader bin/gen-readcf readcf.cc gftables
+                bin/makeheader bin/gen-readcf readcf.cc $(gftables_DATA)
 
 CLEANFILES = factory.h factoryconf.h

libpolys/tests/Makefile.am

@@ -53 +53 @@
 # How to generate *_runner.cpp 
 simple_test_runner.cpp: simple_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer simple_test.h
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer ${srcdir}/simple_test.h
 
 coeffs_test_runner.cpp: coeffs_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer coeffs_test.h
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer ${srcdir}/coeffs_test.h
 
 polys_test_runner.cpp: polys_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer polys_test.h
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer ${srcdir}/polys_test.h
 
 rings_test_runner.cpp: rings_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer rings_test.h
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer ${srcdir}/rings_test.h