Changeset ea0001 in git


Ignore:
Timestamp:
May 12, 2011, 1:11:06 PM (12 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
17b0b0589ef61f1aceedb2f51df2a1d7c82454e5
Parents:
9a90342ac6c7e2f12bfda27f0321e45d10c13c82
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-12 13:11:06+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:07+01:00
Message:
make check finds the gftables and dynamic modules (also out of tree)

- added AM_MAINTAINER_MODE to configure.ac everywhere
- we now symlink to gftables rather than copying
- use GFTABLEDIR to find gftables in nfReadTable
  (this is a hack which breaks Singular when it is installed)
- symlink the dynamic modules from libpolys/polys to libpolys/tests
Files:
9 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    r9a9034 rea0001  
    11AC_INIT([singular], [3.1.2.sw])
    22AC_CONFIG_AUX_DIR([.])
     3AM_MAINTAINER_MODE
    34AM_INIT_AUTOMAKE
    45AC_PROG_CC

  • factory/Makefile.am

    r9a9034 rea0001  
    193193
    194194gftables:       gengftables
    195                 @if test -r ${srcdir}/gftables; then \
    196                         if test ! -r ${builddir}/gftables; then \
    197                           cp -r ${srcdir}/gftables ${builddir}; \
     195                @if test -x ${srcdir}/gftables; then \
     196                        if test ! -x ${builddir}/gftables; then \
     197                          ln -snf ${srcdir}/gftables ${builddir}; \
    198198                        fi; \
    199199                else \

  • factory/configure.ac

    r9a9034 rea0001  
    1818AC_CONFIG_HEADER(config.h)
    1919AC_CONFIG_AUX_DIR([.])
     20AM_MAINTAINER_MODE
    2021AM_INIT_AUTOMAKE
    2122
    … …  
    268269# hence we do not need to mind it here
    269270gftabledir='${datadir}/factory/gftables'
    270 explicit_gftabledir="$explicit_datadir/factory/gftables"
     271explicit_gftabledir="$explicit_datadir/gftables"
    271272
    272273# for installation of the templates

  • libpolys/coeffs/ffields.cc

    r9a9034 rea0001  
    1717#include <resources/feFopen.h>
    1818#include <math.h>
     19#include <factory/factory.h>
    1920
    2021
    … …  
    611612    else     r->m_nfCharQ = -c;
    612613    char buf[100];
    613     sprintf(buf,"gftables/%d",r->m_nfCharQ);
     614    sprintf(buf,GFTABLEDIR "/%d",r->m_nfCharQ);
    614615    FILE * fp = feFopen(buf,"r",NULL,TRUE);
    615616    if (fp==NULL)

  • libpolys/configure.ac

    r9a9034 rea0001  
    44AC_CONFIG_SRCDIR([reporter/reporter.h])
    55AC_CONFIG_HEADER([config.h misc/auxiliary.h])
     6AM_MAINTAINER_MODE
    67AM_INIT_AUTOMAKE
    78

  • libpolys/tests/Makefile.am

    r9a9034 rea0001  
    3131rings_test_LDADD = $(polys_test_LDADD)
    3232
     33noinst_SCRIPTS =        p_Procs_FieldGeneral.so \
     34                        p_Procs_FieldIndep.so \
     35                        p_Procs_FieldQ.so \
     36                        p_Procs_FieldZp.so
    3337
     38p_Procs_FieldGeneral.so:        ${top_builddir}/polys/.libs/p_Procs_FieldGeneral.so
     39                                ln -snf ${top_builddir}/polys/.libs/p_Procs_FieldGeneral.so ${builddir}
     40
     41p_Procs_FieldIndep.so:  ${top_builddir}/polys/.libs/p_Procs_FieldIndep.so
     42                                ln -snf ${top_builddir}/polys/.libs/p_Procs_FieldIndep.so ${builddir}
     43
     44p_Procs_FieldQ.so:      ${top_builddir}/polys/.libs/p_Procs_FieldQ.so
     45                                ln -snf ${top_builddir}/polys/.libs/p_Procs_FieldQ.so ${builddir}
     46
     47p_Procs_FieldZp.so:     ${top_builddir}/polys/.libs/p_Procs_FieldZp.so
     48                                ln -snf ${top_builddir}/polys/.libs/p_Procs_FieldZp.so ${builddir}
    3449
    3550BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)

  • omalloc/configure.ac

    r9a9034 rea0001  
    1212AC_CONFIG_AUX_DIR([.])
    1313
     14AM_MAINTAINER_MODE
    1415AM_INIT_AUTOMAKE
    1516
Note: See TracChangeset for help on using the changeset viewer.