Changeset 6bec87 in git


Ignore:
Timestamp:
Dec 22, 2010, 4:16:34 PM (12 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
9a738f4ce36c0bdd95061c049961fac7b131c5be
Parents:
20b794b84c950b9228e04900a5ccb47c0926cb2e
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2010-12-22 16:16:34+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:23+01:00
Message:
. started migrating polys to automake
. further fixes to the include paths
Location:
libpolys
Files:
7 added
3 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • libpolys/coeffs/COPYING

    r20b794 r6bec87  
    1 /sw/share/automake-1.9/COPYING
     1/sw/share/automake-1.11/COPYING

  • libpolys/coeffs/INSTALL

    r20b794 r6bec87  
    1 /sw/share/automake-1.9/INSTALL
     1/sw/share/automake-1.11/INSTALL

  • libpolys/coeffs/Makefile.am

    r20b794 r6bec87  
    11AM_CXXFLAGS     = -fno-implicit-templates --no-exceptions
    22INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir}
    3 AM_LDFLAGS              = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc
    4 AM_CPPFLAGS             = -DNDEBUG -DOM_NDEBUG
     3AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc
     4AM_CPPFLAGS     = -DNDEBUG -DOM_NDEBUG
     5
     6SOURCES = \
     7        gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
     8        modulop.cc mpr_complex.cc \
     9        numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc
    510
    611lib_LIBRARIES=libcoeffs.a libcoeffs_g.a
    7 
    8 # normal C++ source files
    9 SOURCES = \
    10         gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
    11         modulop.cc mpr_complex.cc \
    12         numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc
    1312
    1413libcoeffs_a_SOURCES = ${SOURCES}
    … …  
    1918noinst_HEADERS= \
    2019        gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h \
    21         mpr_complex.h mpr_global.h \
    22         rintegers.h rmodulo2m.h rmodulon.h shortfl.h
     20        mpr_complex.h mpr_global.h \
     21        rintegers.h rmodulo2m.h rmodulon.h shortfl.h
    2322
    2423include_HEADERS = coeffs.h numbers.h

  • libpolys/polys/configure.ac

    r20b794 r6bec87  
    44AC_PREREQ([2.65])
    55AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
    6 AC_CONFIG_SRCDIR([longalg.cc])
     6AM_INIT_AUTOMAKE
     7AC_CONFIG_SRCDIR([polys.cc])
    78AC_CONFIG_HEADERS([config.h])
    89
    … …  
    1112AC_PROG_CC
    1213AC_PROG_LN_S
     14AC_PROG_RANLIB
    1315
    1416# Checks for libraries.

  • libpolys/polys/monomials/monomials.cc

    r20b794 r6bec87  
    1919#include <stdio.h>
    2020#include <string.h>
    21 #include <auxialiary.h>
     21#include <misc/auxiliary.h>
    2222
    2323#include <omalloc/omalloc.h>
    … …  
    3434#include <polys/monomials/ring.h>
    3535#include <polys/templates/p_Procs.h>
    36 #include <dError.h>
     36#include <reporter/reporter.h>
    3737
    3838#ifdef PDEBUG

  • libpolys/polys/monomials/p_polys.cc

    r20b794 r6bec87  
    1111
    1212
    13 #include <auxialiary.h>
     13#include <misc/auxiliary.h>
    1414
    1515#include <polys/monomials/ring.h>
    16 #include <polys/p_polys.h>
     16#include <polys/monomials/p_polys.h>
    1717#include <polys/monomials/ring.h>
    1818// #include <???/ideals.h>

  • libpolys/polys/monomials/p_polys.h

    r20b794 r6bec87  
    11791179 *  Version: $Id$
    11801180 *******************************************************************/
    1181 #include <mylimits.h>
     1181#include <misc/mylimits.h>
    11821182#include <polys/templates/p_MemCmp.h>
    11831183// #include <polys/structs.h>
    … …  
    12091209#include <omalloc/omalloc.h>
    12101210#include <coeffs/coeffs.h>
    1211 #include <polys/p_polys.h>
     1211#include <polys/monomials/p_polys.h>
    12121212#include <polys/templates/p_MemAdd.h>
    12131213#include <polys/templates/p_MemCopy.h>

  • libpolys/polys/monomials/ring.cc

    r20b794 r6bec87  
    2929// #include <sca.h>
    3030#endif
    31 #include <maps.h>
    32 #include <matpol.h>
     31// #include <???/maps.h>
     32// #include <???/matpol.h>
    3333#ifdef HAVE_FACTORY
    3434#define SI_DONT_HAVE_GLOBAL_VARS
    35 #  include <factory.h>
     35#  include <factory/factory.h>
    3636#endif
    3737

  • libpolys/polys/operations/pShallowCopyDelete.cc

    r20b794 r6bec87  
    1010 *******************************************************************/
    1111#include "polys/config.h"
    12 #include <polys/p_polys.h>
     12#include <polys/monomials/p_polys.h>
    1313#include <polys/monomials/ring.h>
    1414#include <polys/operations/pShallowCopyDelete.h>

  • libpolys/polys/operations/p_Mult_q.cc

    r20b794 r6bec87  
    1818 ***************************************************************/
    1919// #include <polys/options.h>
    20 #include <polys/p_polys.h>
    21 #include <polys/p_Procs.h>
    22 #include <polys/p_Numbers.h>
    23 #include <polys/kbuckets.h>
     20#include <polys/monomials/p_polys.h>
     21#include <polys/templates/p_Procs.h>
     22#include <polys/templates/p_Numbers.h>
     23// #include <???/kbuckets.h>
    2424
    2525#include <polys/operations/p_Mult_q.h>

  • libpolys/polys/pDebug.cc

    r20b794 r6bec87  
    2323// #define PDEBUG 2
    2424
    25 //#include <polys/p_polys.h>
     25//#include <polys/monomials/p_polys.h>
    2626#include <output.h>
    2727#include <omalloc/omalloc.h>

  • libpolys/polys/pInline0.h

    r20b794 r6bec87  
    1818#endif
    1919
    20 #include <polys/p_polys.h>
     20#include <polys/monomials/p_polys.h>
    2121#include <polys/monomials/ring.h>
    2222

  • libpolys/polys/polys.cc

    r20b794 r6bec87  
    1212#include <string.h>
    1313#include <ctype.h>
    14 #include <auxiliary.h>
     14#include <misc/auxiliary.h>
    1515// #include <polys/options.h>
    1616#include <omalloc/omalloc.h>

  • libpolys/polys/polys.h

    r20b794 r6bec87  
    1010*/
    1111
    12 #include <polys/p_polys.h>
     12#include <polys/monomials/p_polys.h>
    1313
    1414/***************************************************************
    … …  
    246246static inline long pTotaldegree(poly p) { return p_Totaldegree(p,currRing); }
    247247#define pWTotaldegree(p) p_WTotaldegree(p,currRing)
    248 #define pWDegree(poly p) p_WDegree(p,currRing)
     248#define pWDegree(p) p_WDegree(p,currRing)
    249249
    250250/*-------------operations on polynomials:------------*/

  • libpolys/polys/polys0.cc

    r20b794 r6bec87  
    1313#include <coeffs/numbers.h>
    1414#include <polys/monomials/ring.h>
    15 #include <polys/p_polys.h>
     15#include <polys/monomials/p_polys.h>
    1616// #include <???/febase.h>
    1717

  • libpolys/polys/polys1.cc

    r20b794 r6bec87  
    1717#include <omalloc/omalloc.h>
    1818// #include <???/febase.h>
    19 #include <polys/weight.h>
    20 #include <polys/intvec.h>
     19// #include <???/weight.h>
     20// #include <???/intvec.h>
    2121#include <polys/ext_fields/longalg.h>
    2222#include <polys/monomials/ring.h>
    23 #include <polys/ideals.h>
     23// #include <???/ideals.h>
    2424#include <polys/polys.h>
    25 //#include "ipid.h"
     25// #include "ipid.h"
    2626#ifdef HAVE_FACTORY
    27 #include <polys/clapsing.h>
     27// #include <???/clapsing.h>
    2828#endif
    2929

  • libpolys/polys/prCopy.cc

    r20b794 r6bec87  
    99#include "polys/config.h"
    1010#include <omalloc/omalloc.h>
    11 #include <polys/p_polys.h>
     11#include <polys/monomials/p_polys.h>
    1212#include <coeffs/numbers.h>
    1313// #include <polys/structs.h>
    … …  
    3030}
    3131
    32 #include <polys/prCopy.inc>
     32// #include <polys/prCopy.inc>
    3333
    3434/////////////////////////////////////////////////////////////////////////

  • libpolys/polys/templates/p_Numbers.h

    r20b794 r6bec87  
    3939#endif
    4040
    41 #include <polys/modulop.h>
     41#include <coeffs/modulop.h>
    4242#define n_Copy_FieldZp(n, r)        n
    4343#define n_Delete_FieldZp(n, r)      ((void)0)

  • libpolys/polys/templates/p_Procs_Dynamic.cc

    r20b794 r6bec87  
    1818#include <polys/p_MemAdd.h>
    1919#include <polys/p_MemCopy.h>
    20 #include <polys/kbuckets.h>
    21 #include <polys/dError.h>
     20// #include <polys/kbuckets.h>
     21#include <reporter/reporter.h>
    2222
    2323#ifdef HAVE_DL

  • libpolys/polys/templates/p_Procs_Static.cc

    r20b794 r6bec87  
    1818#include <polys/p_MemAdd.h>
    1919#include <polys/p_MemCopy.h>
    20 #include <polys/kbuckets.h>
    21 #include <polys/dError.h>
     20// #include <polys/kbuckets.h>
     21#include <reporter/reporter.h>
    2222
    2323BOOLEAN p_procs_dynamic = FALSE;
Note: See TracChangeset for help on using the changeset viewer.