Changeset b530add in git


Ignore:
Timestamp:
Feb 14, 2012, 6:02:55 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')
Children:
025d9ae4f1274b8aa1259b35270dac893452cceb
Parents:
78851c8fa806e127387451b44bac7b5aab116a5eae4d9b177e8176be44cb4f51501e79d5460c1ac9
Message:
Merge pull request #66 from mmklee/factory_sizelong_sw

chg: renamed config.h.in.bak to config.h.in
check for sizeof long in configure
Files:
1 added
1 deleted
12 edited
1 moved

Legend:

Unmodified
Added
Removed

  • Singular/claptmpl.cc

    rae4d9b rb530add  
    6565  // libfac:
    6666#ifdef HAVE_LIBFAC
    67 # include <factory/libfac/factor.h>
     67# include <factory/libfac/libfac.h>
    6868#endif
    6969

  • Singular/extra.cc

    rae4d9b rb530add  
    156156
    157157#ifdef HAVE_LIBFAC
    158 //#include <factory/libfac/factor.h>
     158//#include <factory/libfac/libfac.h>
    159159#endif
    160160

  • factory/Makefile.am

    rae4d9b rb530add  
    99AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS} ${OMALLOC_CFLAGS}
    1010
    11 AM_LDFLAGS =  -L${builddir}
     11AM_LDFLAGS =  -L${abs_builddir}
    1212
    1313lib_LTLIBRARIES = libfactory.la libfactory_g.la
    1414
    1515libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
    16 libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
     16libfactory_la_LIBADD     = ${abs_builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
    1717libfactory_la_LDFLAGS    = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
    1818libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
    19 libfactory_g_la_LIBADD   = ${builddir}/libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
     19libfactory_g_la_LIBADD   = ${abs_builddir}/libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
    2020libfactory_g_la_LDFLAGS  = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
    2121

  • factory/configure.ac

    r78851c8 rb530add  
    125125AC_CHECK_PROG(M4, m4, m4, where-is-your-m4)
    126126AC_CHECK_PROG(BISON, bison, bison, where-is-your-bison)
     127AC_CHECK_SIZEOF(long,4)
    127128AC_C_CONST
    128129AC_C_INLINE

  • factory/ftmpl_inst.cc

    rae4d9b rb530add  
    1414#include "config.h"
    1515
    16 #include <factory/factoryconf.h>
     16// #include <factory/factoryconf.h>
     17// #include "factory.h"
     18#include "cf_iter.h"
     19#include "canonicalform.h"
     20#include "cf_assert.h"
     21#include "cf_reval.h"
     22#include "cf_map.h"
    1723
    18 #include "factory.h"
    1924
    2025#include "templates/ftmpl_array.cc"

  • factory/libfac/Makefile.am

    rae4d9b rb530add  
    4444libfac_includedir=$(includedir)/factory/libfac
    4545
    46 libfac_include_HEADERS   = factor.h
     46libfac_include_HEADERS   = libfac.h
    4747
    4848EXTRA_DIST = factor/class.cc \

  • factory/libfac/factor/Factor.h

    rae4d9b rb530add  
    1010CFFList Factorize( const CanonicalForm & F, int is_SqrFree=0 ) ;
    1111CFFList Factorize( const CanonicalForm & F, const CanonicalForm & mi, int is_SqrFree=0 ) ;
    12 CFFList Factorize2(CanonicalForm F, const CanonicalForm & minpoly );
    1312/*ENDPUBLIC*/
    1413

  • factory/libfac/factor/tmpl_inst.cc

    rae4d9b rb530add  
    44////////////////////////////////////////////////////////////
    55
    6 // #include <factory/templates/ftmpl_array.cc>
     6#include "config.h"
    77
    8 #include "factory.h"
     8// #include <factory/factoryconf.h>
     9
     10// #include "factory.h"
     11#include "cf_iter.h"
     12#include "canonicalform.h"
     13#include "cf_assert.h"
     14#include "cf_reval.h"
    915
    1016#include "templates/ftmpl_array.cc"
    … …  
    1319#include "templates/ftmpl_functions.h"
    1420#include "templates/ftmpl_matrix.cc"
    15 
    16 template class Factor<CanonicalForm>;
    17 template class List<CFFactor>;
    18 template class ListIterator<CFFactor>;
    19 template class List<CanonicalForm>;
    20 template class ListIterator<CanonicalForm>;
    21 template class Array<CanonicalForm>;
    22 template class List<MapPair>;
    23 template class ListIterator<MapPair>;
    24 template class Matrix<CanonicalForm>;
    25 template class SubMatrix<CanonicalForm>;
    26 
    27 #ifndef NOSTREAMIO
    28 template OSTREAM & operator << ( OSTREAM &, const List<CanonicalForm> & );
    29 template OSTREAM & operator << ( OSTREAM &, const List<CFFactor> & );
    30 template OSTREAM & operator << ( OSTREAM &, const List<MapPair> & );
    31 template OSTREAM & operator << ( OSTREAM &, const Array<CanonicalForm> & );
    32 template OSTREAM & operator << ( OSTREAM &, const Factor<CanonicalForm> & );
    33 //template OSTREAM & operator << ( OSTREAM &, const Matrix<CanonicalForm> & );
    34 #endif
    35 
    36 template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
    37 
    38 /*
    39 template CanonicalForm crossprod ( const Array<CanonicalForm>&, const Array<CanonicalForm>& );
    40 template CanonicalForm prod ( const Array<CanonicalForm>& );
    41 */
    42 
    43 template CanonicalForm tmax ( const CanonicalForm&, const CanonicalForm& );
    44 template CanonicalForm tmin ( const CanonicalForm&, const CanonicalForm& );
    45 
    46 template int tmax ( const int&, const int& );
    47 template int tmin ( const int&, const int& );
    4821
    4922// place here your own template stuff, not instantiated by factory
    … …  
    6033template class List<SForm>;
    6134template class ListIterator<SForm>;
    62 
    63 template List<CanonicalForm> Union ( const List<CanonicalForm>&, const List<CanonicalForm>& );
    64 template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const List<CanonicalForm>& );
    6535
    6636#ifndef NOSTREAMIO
    … …  
    8656template class Array<int>;
    8757template class Array<Variable>;
    88 template class Array<REvaluation>;
    8958
    9059// for database

  • factory/libfac/test.cc

    rae4d9b rb530add  
    22///////////////////////////////////////////////////////////////////////////////
    33// Factor - Includes
    4 #include "factor.h"
     4#include "libfac.h"
    55#ifdef HAVE_IOSTREAM
    66#include <iostream>

  • factory/libfac/testcs.cc

    rae4d9b rb530add  
    22
    33#include <factory.h>
    4 #include <factor.h>
     4#include <libfac.h>
    55#ifdef HAVE_IOSTREAM
    66#include <iostream>

  • libpolys/polys/Makefile.am

    rae4d9b rb530add  
    115115
    116116
    117 moduledir = $(libexecdir)/singular/MOD/
     117moduledir = $(bindir)
     118#moduledir = $(libexecdir)/singular/MOD/
    118119
    119120if ENABLE_P_PROCS_DYNAMIC

  • libpolys/polys/clapsing.cc

    rae4d9b rb530add  
    1818
    1919#ifdef HAVE_LIBFAC
    20 #include <factory/libfac/factor.h>
     20#include <factory/libfac/libfac.h>
    2121#endif
    2222
Note: See TracChangeset for help on using the changeset viewer.