Changeset 9840b5 in git


Ignore:
Timestamp:
Feb 22, 2012, 7:26:26 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
825966911e14a0eecc7a3e639cd2e99e210c18e2
Parents:
f2d314f4a0cdb2af36b90c37a45c9c938310b60c
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-22 19:26:26+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 20:34:28+01:00
Message:
chg: better TESTS_ENVIRONMENT

chg: use .libs/gftables directly instead of sym-linking them
chg: removed the MOD creation/usage in kernel & Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    rf2d314 r9840b5  
    306306########################### TEST #########################
    307307
    308 TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_builddir}/libpolys/tests/MOD:${abs_top_builddir}/libpolys/tests/gftables'
     308TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables'
    309309TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
    310310
    … …  
    353353
    354354# These files are built first
    355 BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc mpsr_Tok.inc iparith.inc plural_cmd.inc LIB/all.lib MOD
     355BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc mpsr_Tok.inc iparith.inc plural_cmd.inc LIB/all.lib
    356356
    357357CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
    358 
    359 MOD: ${top_builddir}/libpolys/tests/MOD
    360         [ -d ${builddir}/MOD ] || ln -snf ${top_builddir}/libpolys/tests/MOD ${builddir}/MOD
    361358
    362359feOpt.inc: feOptGen

  • kernel/Makefile.am

    rf2d314 r9840b5  
    8383
    8484
    85 TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/libpolys/tests/MOD:${abs_top_builddir}/libpolys/tests/gftables'
    86 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
     85### TODO: the following has to be addapted...
     86TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables'
     87TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
    8788
    8889TESTS = test-s-g test-s-r test-d-g test-d-r
    … …  
    127128
    128129# These files are built first
    129 BUILT_SOURCES = MOD
     130# BUILT_SOURCES = MOD
    130131
    131 MOD: ${top_builddir}/libpolys/tests/MOD
    132         ln -snf ${top_builddir}/libpolys/tests/MOD ${builddir}/MOD
     132# MOD: ${top_builddir}/libpolys/tests/MOD
     133#       ln -snf ${top_builddir}/libpolys/tests/MOD ${builddir}/MOD
    133134
    134135
    135 CLEANFILES = $(TESTS) $(BUILT_SOURCES)
    136 
    137 
    138 
    139 
     136CLEANFILES = $(TESTS)
     137# $(BUILT_SOURCES)
Note: See TracChangeset for help on using the changeset viewer.