Changeset b1dfaf in git


Ignore:
Timestamp:
Sep 17, 2010, 3:36:19 PM (13 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
7194edf653bb54e050d46f0f8090b86b6ac49d1c
Parents:
dce1e3bbf2389a71a367d500df527054c5d4459f
Message:
patch from Kai (checked for problems under Windows OS: no problems)

git-svn-id: file:///usr/local/Singular/svn/trunk@13210 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
1 added
155 edited

Legend:

Unmodified
Added
Removed

  • README

    rdce1e3 rb1dfaf  
    186186
    187187GOOD LUCK and ENJOY!  Your SINGULAR team.
     188
     189
     190Compiling SINGULAR with cmake
     191=============================
     192
     193compiling SINGULAR with cmake is currently experimental and
     194under development.
     195Use it at your own risk! Parents are liable for their children!

  • Singular/Makefile.in

    rdce1e3 rb1dfaf  
    1818## various paths
    1919##
     20top_srcdir      = @top_srcdir@
    2021srcdir          = @srcdir@
    2122prefix          = @prefix@
    … …  
    5253PIPE            = @PIPE@
    5354CFLAGS          = @CFLAGS@ ${PIPE}
    54 CXXFLAGS        = @CXXFLAGS@ -I@prefix@ ${PIPE}
    55 CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@ -I@prefix@
     55CXXFLAGS        = @CXXFLAGS@ -I.. -I@prefix@ ${PIPE}
     56CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@ -I.. -I@prefix@
    5657ifneq ($(SINGUNAME),ix86-Win)
    57 CPPFLAGS        = -I${srcdir} -I../kernel -I@prefix@ @CPPFLAGS@
     58CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@
    5859else
    5960## Dirs after @CPPFLAGS@ are for PySingular
    60 CPPFLAGS        = -I${srcdir} -I@prefix@ @CPPFLAGS@
     61CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@
    6162## -I/usr/include/python2.4 -I/usr/local/include -I../modules/python
    6263endif
    … …  
    6465LDFLAGS2        = @LDFLAGS@
    6566ifneq ($(SINGUNAME),ix86-Win)
    66 LDFLAGS         = -L@prefix@/kernel -lkernel @LDFLAGS@
    67 LDFLAGSG        = -L@prefix@/kernel -lkernel_g @LDFLAGS@
    68 LDFLAGSP        = -L@prefix@/kernel -lkernel_p @LDFLAGS@
     67LDFLAGS         = -L@prefix@/kernel -L../kernel -lkernel @LDFLAGS@
     68LDFLAGSG        = -L@prefix@/kernel -L../kernel -lkernel_g @LDFLAGS@
     69LDFLAGSP        = -L@prefix@/kernel -L../kernel -lkernel_p @LDFLAGS@
    6970else
    7071## -L/usr/local/lib -L@prefix@/modules/python --> PySingular

  • Singular/Minor.cc

    rdce1e3 rb1dfaf  
    1 #include <Singular/mod2.h>
     1#include <kernel/mod2.h>
    22#include <kernel/structs.h>
    33#include <kernel/polys.h>

  • Singular/MinorInterface.cc

    rdce1e3 rb1dfaf  
    1 #include <Singular/mod2.h>
     1#include <kernel/mod2.h>
    22#include <kernel/structs.h>
    33#include <kernel/polys.h>

  • Singular/MinorProcessor.cc

    rdce1e3 rb1dfaf  
    1 #include <Singular/mod2.h>
     1#include <kernel/mod2.h>
    22#include <kernel/structs.h>
    33#include <kernel/polys.h>
    … …  
    209209{
    210210  /* This is a non-recursive implementation. */
    211   assert(i >= 0 && j >= 0 && i >= j);
     211  assert( (i >= 0) && (j >= 0) && (i >= j));
    212212  if (j == 0 || i == j) return 1;
    213213  int result = 1;

  • Singular/attrib.cc

    rdce1e3 rb1dfaf  
    1414#include <unistd.h>
    1515
    16 #include <Singular/mod2.h>
    17 #include <omalloc.h>
     16#include <kernel/mod2.h>
     17#include <omalloc/omalloc.h>
    1818#include <kernel/options.h>
    1919#include <Singular/tok.h>

  • Singular/calcSVD.cc

    rdce1e3 rb1dfaf  
    11#include <stdio.h>
    2 #include <Singular/mod2.h>
     2#include <kernel/mod2.h>
    33
    44#ifdef HAVE_SVD

  • Singular/claptmpl.cc

    rdce1e3 rb1dfaf  
    88*/
    99
    10 #include <Singular/mod2.h>
     10#include <kernel/mod2.h>
    1111//#include <vector>
    1212//using namespace std;
    1313#ifdef HAVE_FACTORY
    1414  #define SINGULAR 1
    15   #include <factory.h>
    16   #include <templates/ftmpl_list.cc>
     15  #include <factory/factory.h>
     16  #include <factory/templates/ftmpl_list.cc>
    1717  #include <kernel/fglm.h>
    1818
    19   #include <templates/ftmpl_array.cc>
    20   #include <templates/ftmpl_factor.cc>
    21   #include <templates/ftmpl_functions.h>
    22   #include <templates/ftmpl_matrix.cc>
     19  #include <factory/templates/ftmpl_array.cc>
     20  #include <factory/templates/ftmpl_factor.cc>
     21  #include <factory/templates/ftmpl_functions.h>
     22  #include <factory/templates/ftmpl_matrix.cc>
    2323
    2424  template class Factor<CanonicalForm>;
    … …  
    6262// place here your own template stuff, not instantiated by factory
    6363  // libfac:
    64     #include <factor.h>
     64#include <libfac/factor.h>
    6565
    6666// class.h:

  • Singular/cntrlc.cc

    rdce1e3 rb1dfaf  
    1818#include <sys/types.h>
    1919#include <sys/wait.h>
    20 #include <Singular/mod2.h>
    21 #include <omalloc.h>
     20#include <kernel/mod2.h>
     21#include <omalloc/omalloc.h>
    2222#include <Singular/tok.h>
    2323#include <Singular/ipshell.h>

  • Singular/distrib.h

    rdce1e3 rb1dfaf  
    1 #undef MAKE_DISTRIBUTION
     1/*
     2
     3*/
     4
     5/* define this if we pack a distribution */
     6/* #undef MAKE_DISTRIBUTION */

  • Singular/eigenval_ip.cc

    rdce1e3 rb1dfaf  
    77*/
    88
    9 #include <Singular/mod2.h>
     9#include <kernel/mod2.h>
    1010
    1111#ifdef HAVE_EIGENVAL

  • Singular/emacs.cc

    rdce1e3 rb1dfaf  
    1919#include <windows.h>
    2020#endif
    21 #include <Singular/mod2.h>
     21#include <kernel/mod2.h>
    2222#include <Singular/version.h>
    23 #include <omalloc.h>
     23#include <omalloc/omalloc.h>
    2424
    2525#if !defined(TSINGULAR) && !defined(ESINGULAR)

  • Singular/extra.cc

    rdce1e3 rb1dfaf  
    1414#include <ctype.h>
    1515#include <signal.h>
    16 #include <Singular/mod2.h>
     16#include <kernel/mod2.h>
    1717#include <misc_ip.h>
    1818
    … …  
    9696#endif
    9797
     98#include <kernel/sca.h>
    9899#ifdef HAVE_PLURAL
    99100#include <kernel/ring.h>
    100 #include <kernel/ring.h>
    101 #include <kernel/sca.h>
    102101#include <kernel/ncSAMult.h> // for CMultiplier etc classes
    103102#include <Singular/ipconv.h>
    … …  
    123122#ifdef HAVE_FACTORY
    124123#define SI_DONT_HAVE_GLOBAL_VARS
    125 #include <kernel/clapsing.h>
    126124#include <kernel/clapconv.h>
    127125#include <kernel/kstdfac.h>
    128126#endif
     127#include <kernel/clapsing.h>
    129128
    130129#include <Singular/silink.h>
    … …  
    19991998
    20001999
    2001   #ifdef HAVE_EXTENDED_SYSTEM
     2000#ifdef HAVE_EXTENDED_SYSTEM
    20022001  // You can put your own system calls here
    2003   #include <kernel/fglmcomb.cc>
    2004   #include <kernel/fglm.h>
    2005   #ifdef HAVE_NEWTON
    2006   #include <hc_newton.h>
    2007   #endif
    2008   #include <mpsr.h>
    2009   #include <kernel/mod_raw.h>
    2010   #include <kernel/ring.h>
    2011   #include <kernel/shiftgb.h>
     2002#  include <kernel/fglmcomb.cc>
     2003#  include <kernel/fglm.h>
     2004#  ifdef HAVE_NEWTON
     2005#    include <hc_newton.h>
     2006#  endif
     2007#  include <mpsr.h>
     2008#  include <kernel/mod_raw.h>
     2009#  include <kernel/ring.h>
     2010#  include <kernel/shiftgb.h>
    20122011
    20132012  static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h)
    … …  
    32963295        if (h==NULL)
    32973296        {
     3297#ifdef HAVE_PLURAL
    32983298          Print("NTL_0:%d (use NTL for gcd of polynomials in char 0)\n",isOn(SW_USE_NTL_GCD_0));
    32993299          Print("NTL_p:%d (use NTL for gcd of polynomials in char p)\n",isOn(SW_USE_NTL_GCD_P));
    … …  
    33043304          Print("QGCD:%d (use QGCD for gcd of polynomials in alg. ext.)\n",isOn(SW_USE_QGCD));
    33053305          Print("FGCD:%d (use fieldGCD for gcd of polynomials in Z/p)\n",isOn(SW_USE_fieldGCD));
     3306#endif
    33063307          Print("homog:%d (use homog. test for factorization of polynomials)\n",singular_homog_flag);
    33073308          return FALSE;
    … …  
    33133314          int d=(int)(long)h->next->Data();
    33143315          char *s=(char *)h->Data();
     3316#ifdef HAVE_PLURAL
    33153317          if (strcmp(s,"NTL_0")==0) { if (d) On(SW_USE_NTL_GCD_0); else Off(SW_USE_NTL_GCD_0); } else
    33163318          if (strcmp(s,"NTL_p")==0) { if (d) On(SW_USE_NTL_GCD_P); else Off(SW_USE_NTL_GCD_P); } else
    … …  
    33213323          if (strcmp(s,"QGCD")==0) { if (d) On(SW_USE_QGCD); else Off(SW_USE_QGCD); } else
    33223324          if (strcmp(s,"FGCD")==0) { if (d) On(SW_USE_fieldGCD); else Off(SW_USE_fieldGCD); } else
     3325#endif
    33233326          if (strcmp(s,"homog")==0) { if (d) singular_homog_flag=1; else singular_homog_flag=0; } else
    33243327          return TRUE;

  • Singular/feOpt.cc

    rdce1e3 rb1dfaf  
    286286//         "error-string" on error
    287287#if !defined(ESINGULAR) && !defined(TSINGULAR)
    288 #include <omalloc.h>
     288#include <omalloc/omalloc.h>
    289289#include <kernel/febase.h>
    290290#include <Singular/ipshell.h>
    … …  
    296296#ifdef HAVE_FACTORY
    297297#define SI_DONT_HAVE_GLOBAL_VARS
    298 #include <factory.h>
     298#include <factory/factory.h>
    299299#endif
    300300#include <errno.h>

  • Singular/fehelp.cc

    rdce1e3 rb1dfaf  
    1414#include <time.h>
    1515
    16 #include <Singular/mod2.h>
    17 #include <mylimits.h>
     16#include <kernel/mod2.h>
     17#include <omalloc/mylimits.h>
    1818#include <Singular/tok.h>
    19 #include <omalloc.h>
     19#include <omalloc/omalloc.h>
    2020#include <kernel/febase.h>
    2121#include <Singular/ipid.h>

  • Singular/fglm.cc

    rdce1e3 rb1dfaf  
    1717*/
    1818
    19 #include <Singular/mod2.h>
     19#include <kernel/mod2.h>
    2020
    2121#ifdef HAVE_FACTORY
    … …  
    2929#include <kernel/febase.h>
    3030#include <kernel/maps.h>
    31 #include <omalloc.h>
     31#include <omalloc/omalloc.h>
    3232#include <kernel/kstd1.h>
    3333#include <kernel/fglm.h>

  • Singular/gms.cc

    rdce1e3 rb1dfaf  
    77*/
    88
    9 #include <Singular/mod2.h>
     9#include <kernel/mod2.h>
    1010
    1111#ifdef HAVE_GMS

  • Singular/grammar.cc

    rdce1e3 rb1dfaf  
    334334#include <string.h>
    335335
    336 #include <Singular/mod2.h>
    337 #include <mylimits.h>
    338 #include <omalloc.h>
     336#include <kernel/mod2.h>
     337#include <omalloc/mylimits.h>
     338#include <omalloc/omalloc.h>
    339339#include <Singular/tok.h>
    340340#include <kernel/options.h>

  • Singular/grammar.y

    rdce1e3 rb1dfaf  
    1414#include <string.h>
    1515
    16 #include <Singular/mod2.h>
    17 #include <mylimits.h>
    18 #include <omalloc.h>
     16#include <kernel/mod2.h>
     17#include <omalloc/mylimits.h>
     18#include <omalloc/omalloc.h>
    1919#include <Singular/tok.h>
    2020#include <kernel/options.h>
    … …  
    418418            if (inerror)
    419419            {
     420/*  bison failed here
    420421              if ((inerror!=3) && ($1.i<UMINUS) && ($1.i>' '))
    421422              {
    … …  
    426427                Print(" error at token `%s`\n",iiTwoOps($1.i));
    427428              }
     429*/
    428430            }
    429431            if (!errorreported) WerrorS("...parse error");

  • Singular/interpolation.cc

    rdce1e3 rb1dfaf  
    44/* $Id$ */
    55
    6 #include <Singular/mod2.h>
     6#include <kernel/mod2.h>
    77#include <kernel/options.h>
    88#include <kernel/febase.h>
    … …  
    1515#include <kernel/ring.h>
    1616#ifdef HAVE_FACTORY
    17 #include <factory.h>
    18 #endif
     17#  include <factory/factory.h>
     18#endif /* HAVE_FACTORY */
    1919
    2020//memory management

  • Singular/iparith.cc

    rdce1e3 rb1dfaf  
    1515#include <unistd.h>
    1616
    17 #include <Singular/mod2.h>
     17#include <kernel/mod2.h>
    1818#include <Singular/tok.h>
    1919#include <kernel/options.h>
    2020#include <Singular/ipid.h>
    2121#include <kernel/intvec.h>
    22 #include <omalloc.h>
     22#include <omalloc/omalloc.h>
    2323#include <kernel/polys.h>
    2424#include <kernel/febase.h>
    … …  
    5959#include <Singular/misc_ip.h>
    6060#ifdef HAVE_FACTORY
    61 #include <kernel/clapsing.h>
    62 #include <kernel/kstdfac.h>
     61#  include <kernel/clapsing.h>
     62#  include <kernel/kstdfac.h>
    6363#endif /* HAVE_FACTORY */
    6464#ifdef HAVE_FACTORY
    65 #include <kernel/fglm.h>
     65#  include <kernel/fglm.h>
    6666#endif /* HAVE_FACTORY */
    6767#define HAVE_INTERPOLATION
    6868#ifdef HAVE_INTERPOLATION
    69 #include <Singular/interpolation.h>
     69#  include <Singular/interpolation.h>
    7070#endif
    7171
    … …  
    90309030/*-------------------------------------------------------------------*/
    90319031#else
    9032 #include <Singular/iparith.inc>
     9032#include <iparith.inc>
    90339033#endif
    90349034

  • Singular/ipassign.cc

    rdce1e3 rb1dfaf  
    1313#include <ctype.h>
    1414
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616#include <Singular/tok.h>
    1717#include <kernel/options.h>
    … …  
    1919#include <kernel/idrec.h>
    2020#include <kernel/intvec.h>
    21 #include <omalloc.h>
     21#include <omalloc/omalloc.h>
    2222#include <kernel/febase.h>
    2323#include <kernel/polys.h>

  • Singular/ipconv.cc

    rdce1e3 rb1dfaf  
    77*/
    88
    9 #include <Singular/mod2.h>
     9#include <kernel/mod2.h>
    1010#include <Singular/tok.h>
    1111#include <Singular/ipid.h>
    1212#include <kernel/intvec.h>
    1313#include <kernel/options.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/febase.h>
    1616#include <kernel/polys.h>

  • Singular/ipid.cc

    rdce1e3 rb1dfaf  
    1010#include <string.h>
    1111
    12 #include <Singular/mod2.h>
     12#include <kernel/mod2.h>
    1313#include <Singular/static.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <Singular/tok.h>
    1616#include <kernel/options.h>

  • Singular/iplib.cc

    rdce1e3 rb1dfaf  
    1313#include <sys/stat.h>
    1414
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616#include <Singular/static.h>
    1717#include <Singular/tok.h>
    1818#include <kernel/options.h>
    1919#include <Singular/ipid.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121#include <kernel/febase.h>
    2222#include <kernel/ring.h>

  • Singular/ipprint.cc

    rdce1e3 rb1dfaf  
    77*/
    88
    9 #include <Singular/mod2.h>
     9#include <kernel/mod2.h>
    1010#include <Singular/tok.h>
    1111#include <Singular/ipid.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/febase.h>
    1414#include <kernel/polys.h>

  • Singular/ipshell.cc

    rdce1e3 rb1dfaf  
    1313#include <math.h>
    1414
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616#include <Singular/tok.h>
    1717#include <kernel/options.h>
    1818#include <Singular/ipid.h>
    1919#include <kernel/intvec.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121#include <kernel/febase.h>
    2222#include <kernel/polys.h>
    … …  
    5050#ifdef HAVE_FACTORY
    5151#define SI_DONT_HAVE_GLOBAL_VARS
    52 #include <factory.h>
     52#include <factory/factory.h>
    5353#endif
    5454

  • Singular/janet.cc

    rdce1e3 rb1dfaf  
    44#include <time.h>
    55
    6 #include <Singular/mod2.h>
    7 #include <omalloc.h>
     6#include <kernel/mod2.h>
     7#include <omalloc/omalloc.h>
    88#include <kernel/polys.h>
    99#include <kernel/numbers.h>

  • Singular/libparse.l

    rdce1e3 rb1dfaf  
    88#include <stdlib.h>
    99#include <ctype.h>
    10 #include <Singular/mod2.h>
     10#include <kernel/mod2.h>
    1111#ifdef STANDALONE_PARSER
    1212  #include <Singular/utils.h>
    … …  
    2222  #include <kernel/options.h>
    2323  #include <kernel/febase.h>
    24   #include <omalloc.h>
     24  #include <omalloc/omalloc.h>
    2525#endif
    2626#include <Singular/libparse.h>
    … …  
    5252
    5353char *yylp_buffer_start;
     54#ifndef NEW_FLEX
    5455int yylplineno = 1;
     56#endif /* NEW_FLEX */
    5557int lpverbose = 0, check = 0;
    5658int texinfo_out = 0;
    … …  
    845847   quote  = 0;
    846848   yy_init=1;
    847    yy_delete_buffer(yy_current_buffer);
     849   yy_delete_buffer(YY_CURRENT_BUFFER);
    848850}
    849851

  • Singular/libsingular.h

    rdce1e3 rb1dfaf  
    1111#include <kernel/febase.h>
    1212#include <kernel/ring.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <Singular/singular/clapsing.h>
    1515#include <kernel/maps.h>

  • Singular/lists.cc

    rdce1e3 rb1dfaf  
    99#define LISTS_CC
    1010
    11 #include <Singular/mod2.h>
     11#include <kernel/mod2.h>
    1212#include <Singular/tok.h>
    1313#include <kernel/febase.h>

  • Singular/lists.h

    rdce1e3 rb1dfaf  
    88* ABSTRACT: handling of the list type
    99*/
    10 #include <omalloc.h>
     10#include <omalloc/omalloc.h>
    1111#include <kernel/structs.h>
    1212#include <kernel/ideals.h>

  • Singular/maps_ip.cc

    rdce1e3 rb1dfaf  
    77*/
    88
    9 #include <Singular/mod2.h>
     9#include <kernel/mod2.h>
    1010#include <Singular/tok.h>
    1111#include <kernel/febase.h>
    … …  
    1515#include <kernel/ideals.h>
    1616#include <kernel/matpol.h>
    17 #include <omalloc.h>
     17#include <omalloc/omalloc.h>
    1818#include <kernel/kstd1.h>
    1919#include <kernel/longalg.h>

  • Singular/misc_ip.cc

    rdce1e3 rb1dfaf  
    1717
    1818// include header files
    19 #include <Singular/mod2.h>
     19#include <kernel/mod2.h>
    2020#include <Singular/lists.h>
    2121#include <kernel/longrat.h>
    … …  
    283283#include <time.h>
    284284
    285 #include <mylimits.h>
    286 #include <omalloc.h>
     285#include <omalloc/mylimits.h>
     286#include <omalloc/omalloc.h>
    287287#include <kernel/options.h>
    288288#include <kernel/febase.h>
    … …  
    316316
    317317#ifdef HAVE_FACTORY
    318 #include <factory.h>
     318#include <factory/factory.h>
    319319// libfac:
    320320  extern const char * libfac_version;

  • Singular/mpsr.h

    rdce1e3 rb1dfaf  
    2323#include <kernel/structs.h>
    2424#include "subexpr.h"
    25 #include <omalloc.h>
     25#include <omalloc/omalloc.h>
    2626#include <kernel/polys.h>
    2727#include <kernel/numbers.h>

  • Singular/mpsr_Error.cc

    rdce1e3 rb1dfaf  
    1313 *
    1414 ***************************************************************/
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616
    1717#ifdef HAVE_MPSR

  • Singular/mpsr_Get.cc

    rdce1e3 rb1dfaf  
    1414 ***************************************************************/
    1515
    16 #include <Singular/mod2.h>
     16#include <kernel/mod2.h>
    1717
    1818#ifdef HAVE_MPSR

  • Singular/mpsr_GetMisc.cc

    rdce1e3 rb1dfaf  
    1414 ***************************************************************/
    1515
    16 #include <Singular/mod2.h>
     16#include <kernel/mod2.h>
    1717
    1818#ifdef HAVE_MPSR

  • Singular/mpsr_GetPoly.cc

    rdce1e3 rb1dfaf  
    1313 *
    1414 ***************************************************************/
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616
    1717#ifdef HAVE_MPSR
    … …  
    2121
    2222#include <kernel/si_gmp.h>
    23 #include <omalloc.h>
     23#include <omalloc/omalloc.h>
    2424#include <Singular/tok.h>
    2525#include <Singular/ipid.h>

  • Singular/mpsr_Put.cc

    rdce1e3 rb1dfaf  
    1515 *
    1616 ***************************************************************/
    17 #include <Singular/mod2.h>
     17#include <kernel/mod2.h>
    1818
    1919#ifdef HAVE_MPSR

  • Singular/mpsr_PutPoly.cc

    rdce1e3 rb1dfaf  
    1616 *
    1717 ***************************************************************/
    18 #include <Singular/mod2.h>
     18#include <kernel/mod2.h>
    1919
    2020#ifdef HAVE_MPSR
    … …  
    2323#include <Singular/mpsr_Tok.h>
    2424#include "kernel/longalg.h"
    25 #include <omalloc.h>
     25#include <omalloc/omalloc.h>
    2626#include <kernel/ring.h>
    2727#include <kernel/polys.h>

  • Singular/mpsr_Tok.cc

    rdce1e3 rb1dfaf  
    1919#include <unistd.h>
    2020
    21 #include"mod2.h"
     21#include <kernel/mod2.h>
    2222
    2323#ifdef HAVE_MPSR
    2424
    25 #include"kernel/febase.h"
    26 #include"tok.h"
     25#include <kernel/febase.h>
     26#include <tok.h>
    2727
    2828#include <Singular/mpsr.h>

  • Singular/mpsr_sl.cc

    rdce1e3 rb1dfaf  
    1010 *******************************************************************/
    1111
    12 #include <Singular/mod2.h>
     12#include <kernel/mod2.h>
    1313
    1414#ifdef HAVE_MPSR
    … …  
    2323#include <Singular/mpsr.h>
    2424#include <Singular/tok.h>
    25 #include <omalloc.h>
     25#include <omalloc/omalloc.h>
    2626#include <kernel/febase.h>
    2727#include <Singular/subexpr.h>

  • Singular/ndbm.cc

    rdce1e3 rb1dfaf  
    1515//**************************************************************************/
    1616
    17 #include <Singular/mod2.h>
     17#include <kernel/mod2.h>
    1818#ifdef HAVE_DBM
    1919#ifndef HPUX_9

  • Singular/omSingularConfig.h

    rdce1e3 rb1dfaf  
    11/*******************************************************************
    22 *  File:    omSingularConfig.h
    3 #include <omalloc.h>
     3#include <omalloc/omalloc.h>
    44 *           This file is inlcuded by omDefaultConfig.h, i.e., at the the time
    5 #include <omalloc.h>
    6 #include <omalloc.h>
     5#include <omalloc/omalloc.h>
     6#include <omalloc/omalloc.h>
    77 *           rebuilt the library).
    88 *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)

  • Singular/pcv.cc

    rdce1e3 rb1dfaf  
    77*/
    88
    9 #include <Singular/mod2.h>
     9#include <kernel/mod2.h>
    1010
    1111#ifdef HAVE_PCV

  • Singular/pipeLink.cc

    rdce1e3 rb1dfaf  
    2222#include "tok.h"
    2323#include "ipid.h"
    24 #include <omalloc.h>
     24#include <omalloc/omalloc.h>
    2525#include "subexpr.h"
    2626#include "silink.h"

  • Singular/scanner.cc

    rdce1e3 rb1dfaf  
    562562#include <ctype.h>
    563563
    564 #include <Singular/mod2.h>
    565 #include <omalloc.h>
     564#include <kernel/mod2.h>
     565#include <omalloc/omalloc.h>
    566566#include <Singular/tok.h>
    567567#include <Singular/stype.h>

  • Singular/scanner.l

    rdce1e3 rb1dfaf  
    99#include <ctype.h>
    1010
    11 #include <Singular/mod2.h>
    12 #include <omalloc.h>
     11#include <kernel/mod2.h>
     12#include <omalloc/omalloc.h>
    1313#include <Singular/tok.h>
    1414#include <Singular/stype.h>
    15 #include <Singular/ipshell.h?
     15#include <Singular/ipshell.h>
    1616#include <kernel/febase.h>
    1717
    1818int feReadLine(char* b, int l);
    1919#define ALLOC(a) omAlloc((a))
     20#ifndef NEW_FLEX
    2021int yylineno  = 0;
     22#endif /* NEW_LEX */
    2123int blocknest = 0;
    2224extern char * yytext;
    … …  
    367369void * myynewbuffer()
    368370{
    369   void * oldb = yy_current_buffer;
     371  void * oldb = YY_CURRENT_BUFFER;
    370372  yy_switch_to_buffer(yy_create_buffer(NULL, YY_BUF_SIZE));
    371373  return oldb;
    … …  
    374376void myyoldbuffer(void * oldb)
    375377{
    376   yy_delete_buffer(yy_current_buffer);
     378  yy_delete_buffer(YY_CURRENT_BUFFER);
    377379  yy_switch_to_buffer((YY_BUFFER_STATE)oldb);
    378380  //yy_flush_buffer((YY_BUFFER_STATE)oldb);

  • Singular/sdb.cc

    rdce1e3 rb1dfaf  
    99#include <unistd.h>   // for unlink,fork,execlp,getpid
    1010#include <sys/wait.h> // for wait
    11 #include <Singular/mod2.h>
     11#include <kernel/mod2.h>
    1212#include <Singular/tok.h>
    1313#include <kernel/options.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/febase.h>
    1616#include <Singular/ipshell.h>

  • Singular/silink.cc

    rdce1e3 rb1dfaf  
    1414#include <unistd.h>
    1515
    16 #include <Singular/mod2.h>
     16#include <kernel/mod2.h>
    1717#include <Singular/tok.h>
    1818#include <kernel/options.h>
    19 #include <omalloc.h>
     19#include <omalloc/omalloc.h>
    2020#include <kernel/febase.h>
    2121#include <Singular/subexpr.h>

  • Singular/silink.h

    rdce1e3 rb1dfaf  
    8585}
    8686
    87 #include <omalloc.h>
     87#include <omalloc/omalloc.h>
    8888inline char* slString(si_link l)
    8989{

  • Singular/sing_dbm.cc

    rdce1e3 rb1dfaf  
    1717#  include <errno.h>
    1818
    19 #include <Singular/mod2.h>
     19#include <kernel/mod2.h>
    2020
    2121#ifdef HAVE_DBM
    … …  
    2323#  include <Singular/tok.h>
    2424#  include <kernel/febase.h>
    25 #include <omalloc.h>
     25#include <omalloc/omalloc.h>
    2626#  include <Singular/ipid.h>
    2727#  include <Singular/silink.h>

  • Singular/sing_win.cc

    rdce1e3 rb1dfaf  
    88*/
    99
    10 #include <Singular/mod2.h>
     10#include <kernel/mod2.h>
    1111#ifdef ix86_Win
    1212#include <windows.h>

  • Singular/slInit_Dynamic.cc

    rdce1e3 rb1dfaf  
    1515 *
    1616 ***************************************************************/
    17 #include <Singular/mod2.h>
     17#include <kernel/mod2.h>
    1818#include <Singular/silink.h>
    1919#include <Singular/slInit.h>

  • Singular/slInit_Static.cc

    rdce1e3 rb1dfaf  
    1515 *
    1616 ***************************************************************/
    17 #include <Singular/mod2.h>
     17#include <kernel/mod2.h>
    1818#include <Singular/silink.h>
    1919#include <Singular/slInit.h>

  • Singular/ssiLink.cc

    rdce1e3 rb1dfaf  
    2525#include "tok.h"
    2626#include "ipid.h"
    27 #include <omalloc.h>
     27#include <omalloc/omalloc.h>
    2828#include <kernel/ring.h>
    2929#include <kernel/matpol.h>

  • Singular/subexpr.cc

    rdce1e3 rb1dfaf  
    1313#include <unistd.h>
    1414
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616#include <kernel/intvec.h>
    1717#include <Singular/tok.h>
    … …  
    1919#include <Singular/ipid.h>
    2020#include <kernel/intvec.h>
    21 #include <omalloc.h>
     21#include <omalloc/omalloc.h>
    2222#include <kernel/febase.h>
    2323#include <kernel/polys.h>

  • Singular/tesths.cc

    rdce1e3 rb1dfaf  
    1515#include <time.h>
    1616#include <errno.h>
    17 #include <Singular/mod2.h>
     17#include <kernel/mod2.h>
    1818#include <Singular/tok.h>
    1919#include <kernel/options.h>
    … …  
    2121#include <kernel/febase.h>
    2222#include <Singular/cntrlc.h>
    23 #include <omalloc.h>
     23#include <omalloc/omalloc.h>
    2424#include <Singular/silink.h>
    2525#include <Singular/ipid.h>
    … …  
    3535#ifdef HAVE_FACTORY
    3636#define SI_DONT_HAVE_GLOBAL_VARS
    37 #include <factory.h>
     37#include <factory/factory.h>
    3838#endif
    3939
    … …  
    6868    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
    6969    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
    70 #include <omalloc.h>
     70#include <omalloc/omalloc.h>
    7171    /* do not rely on the default in Singular as libsingular may be different */
    7272    mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);

  • Singular/walk.cc

    rdce1e3 rb1dfaf  
    4747
    4848
    49 #include <Singular/mod2.h>
     49#include <kernel/mod2.h>
    5050#include <kernel/intvec.h>
    5151#include <Singular/cntrlc.h>
    5252#include <kernel/options.h>
    53 #include <omalloc.h>
     53#include <omalloc/omalloc.h>
    5454#include <kernel/febase.h>
    5555#include <Singular/ipshell.h>

  • Singular/walk_ip.cc

    rdce1e3 rb1dfaf  
    1313#include <math.h>
    1414
    15 #include <Singular/mod2.h>
     15#include <kernel/mod2.h>
    1616#include <Singular/tok.h>
    1717#include <kernel/options.h>
    1818#include <Singular/ipid.h>
    1919#include <kernel/intvec.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121#include <kernel/febase.h>
    2222#include <kernel/polys.h>

  • Singular/wrapper.cc

    rdce1e3 rb1dfaf  
    11#include <string.h>
    2 #include <Singular/mod2.h>
     2#include <kernel/mod2.h>
    33#include <kernel/febase.h>
    44#include <kernel/polys.h>

  • factory/GNUmakefile.in

    rdce1e3 rb1dfaf  
    9797# flags to translate library c files
    9898LIBCFLAGS =     $(WARNFLAGS) \
    99                 -I. -I$(srcdir) -I$(includedir) \
     99                -I. -I.. -I$(srcdir) -I${prefix} -I$(includedir) \
    100100                $(DEFS) $(CPPFLAGS) $(CFLAGS)
    101101
    102102# flags to translate library c++ files
    103103LIBCXXFLAGS =   $(WARNFLAGS) -fno-implicit-templates \
    104                 -I. -I$(srcdir) -I$(includedir) \
     104                -I. -I.. -I$(srcdir) -I${prefix} -I$(includedir) \
    105105                $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
    106106
    107107LIBCGGFLAGS =   $(WARNFLAGS) -fno-implicit-templates \
    108                 -I. -I$(srcdir) -I$(includedir) \
     108                -I. -I.. -I$(srcdir) -I${prefix} -I$(includedir) \
    109109                $(DEFS) $(CPPFLAGS)
    110110
    … …  
    119119
    120120# flags to create dependency lists
    121 DEPCXXFLAGS =   -I. -I$(srcdir) -I$(includedir) \
     121DEPCXXFLAGS =   -I. -I.. -I$(srcdir) -I${prefix} -I$(includedir) \
    122122                $(DEFS) $(CPPFLAGS)
    123123
    … …  
    608608# after installation.
    609609test_install.o: test_install.cc factory.h
    610                 $(CXX) -c $< $(TESTCXXFLAGS) -I- -I$(includedir) -o $@
     610                $(CXX) -c $< $(TESTCXXFLAGS) -I- -I${prefix} -I$(includedir) -o $@
    611611
    612612# the same we do for ftmpl_inst.o which for this reason is named
    613613# iftmpl_inst.o
    614614iftmpl_inst.o: factory.h
    615                 $(CXX) -c $(templatedir)/ftmpl_inst.cc $(TMPLCXXFLAGS) -I- -I$(includedir) -o $@
     615                $(CXX) -c $(templatedir)/ftmpl_inst.cc $(TMPLCXXFLAGS) -I- -I${prefix} -I$(includedir) -o $@
    616616
    617617# link installation test program

  • factory/bin/makeheader

    rdce1e3 rb1dfaf  
    9898    # get include file from next line
    9999    read line
     100#    if echo "$line" | grep -v '^#include <factory/.*>$' > /dev/null 2> /dev/null; then
    100101    if echo "$line" | grep -v '^#include ".*"$' > /dev/null 2> /dev/null; then
    101102        echo "makeheader: Invalid include statement $line" 1>&2
    … …  
    103104    fi
    104105    includefile=`echo "$line" | sed 's/^#include "//; s/"$//'`
     106#    includefile=`echo "$line" | sed 's/^#include <factory//; s/>$//'`
    105107
    106108    # search for includefile

  • factory/factory.template

    rdce1e3 rb1dfaf  
    2222//}}}
    2323
    24 #include <factoryconf.h>
     24#include <factory/factoryconf.h>
    2525
    2626#ifndef NOSTREAMIO
    27 #ifdef HAVE_IOSTREAM
    28 #include <iostream>
    29 #define OSTREAM std::ostream
    30 #define ISTREAM std::istream
    31 #elif defined(HAVE_IOSTREAM_H)
    32 #include <iostream.h>
    33 #define OSTREAM ostream
    34 #define ISTREAM istream
    35 #endif
     27#  ifdef HAVE_IOSTREAM
     28#    include <iostream>
     29#    define OSTREAM std::ostream
     30#    define ISTREAM std::istream
     31#  elif defined(HAVE_IOSTREAM_H)
     32#    include <iostream.h>
     33#    define OSTREAM ostream
     34#    define ISTREAM istream
     35#  endif
    3636#endif /* ! NOSTREAMIO */
    3737
    3838#ifdef SINGULAR
    39 #include "cf_gmp.h"
     39#  include <factory/cf_gmp.h>
    4040#else
    41 #include <gmp.h>
     41#  include <gmp.h>
    4242#endif /* SINGULAR */
    4343
    44 #include <templates/ftmpl_array.h>
    45 #include <templates/ftmpl_factor.h>
    46 #include <templates/ftmpl_list.h>
    47 #include <templates/ftmpl_matrix.h>
     44#include <factory/templates/ftmpl_array.h>
     45#include <factory/templates/ftmpl_factor.h>
     46#include <factory/templates/ftmpl_list.h>
     47#include <factory/templates/ftmpl_matrix.h>
    4848
    4949/*MAKEHEADER PUBLIC ONLY*/

  • factory/int_int.h

    rdce1e3 rb1dfaf  
    3030
    3131#ifdef HAVE_OMALLOC
    32 #include <omalloc.h>
     32#  include <omalloc/omalloc.h>
    3333#endif
    3434

  • factory/int_poly.h

    rdce1e3 rb1dfaf  
    2929
    3030#ifdef HAVE_OMALLOC
    31 #include <omalloc.h>
     31#  include <omalloc/omalloc.h>
    3232#endif
    3333

  • factory/templates/ftmpl_array.cc

    rdce1e3 rb1dfaf  
    22/* $Id$ */
    33
    4 #include <factoryconf.h>
    5 
    6 #include <templates/ftmpl_array.h>
     4#include <factory/templates/ftmpl_array.h>
    75
    86template <class T>

  • factory/templates/ftmpl_array.h

    rdce1e3 rb1dfaf  
    55#define INCL_ARRAY_H
    66
    7 #include <factoryconf.h>
     7#include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/templates/ftmpl_factor.cc

    rdce1e3 rb1dfaf  
    22/* $Id$ */
    33
    4 #include <factoryconf.h>
    5 
    6 #include <templates/ftmpl_factor.h>
     4#include <factory/templates/ftmpl_factor.h>
    75
    86template <class T>

  • factory/templates/ftmpl_factor.h

    rdce1e3 rb1dfaf  
    55#define INCL_FACTOR_H
    66
    7 #include <factoryconf.h>
     7#include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/templates/ftmpl_functions.h

    rdce1e3 rb1dfaf  
    2727//}}}
    2828
    29 #include <factoryconf.h>
     29#include <factory/factoryconf.h>
    3030
    3131//{{{ template <class T> inline T tmax ( const T & a, const T & b )

  • factory/templates/ftmpl_list.cc

    rdce1e3 rb1dfaf  
    22/* $Id$ */
    33
    4 #include <factoryconf.h>
    5 
    6 #include <templates/ftmpl_list.h>
     4#include <factory/templates/ftmpl_list.h>
    75
    86template <class T>

  • factory/templates/ftmpl_list.h

    rdce1e3 rb1dfaf  
    55#define INCL_LIST_H
    66
    7 #include <factoryconf.h>
     7#include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/templates/ftmpl_matrix.cc

    rdce1e3 rb1dfaf  
    22/* $Id$ */
    33
    4 #include <factoryconf.h>
    5 
    6 #include <templates/ftmpl_matrix.h>
     4#include <factory/templates/ftmpl_matrix.h>
    75
    86template <class T>

  • factory/templates/ftmpl_matrix.h

    rdce1e3 rb1dfaf  
    55#define INCL_MATRIX_H
    66
    7 #include <factoryconf.h>
     7#include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • kernel/Makefile.in

    rdce1e3 rb1dfaf  
    4949CXXFLAGS        = @CXXFLAGS@ ${PIPE}
    5050CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@
    51 CPPFLAGS        = -I${srcdir} -I@prefix@  @CPPFLAGS@
     51CPPFLAGS        = -I${srcdir} -I.. -I@prefix@  @CPPFLAGS@
    5252DEFS            = -DNDEBUG -DOM_NDEBUG -D@SING_UNAME@ @DEFS@
    5353LDFLAGS         = @LDFLAGS@

  • kernel/clapconv.cc

    rdce1e3 rb1dfaf  
    1111#include <kernel/mod2.h>
    1212#ifdef HAVE_FACTORY
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <kernel/structs.h>
    1515#define SI_DONT_HAVE_GLOBAL_VARS

  • kernel/clapconv.h

    rdce1e3 rb1dfaf  
    1515#include <kernel/longalg.h>
    1616#include <kernel/ring.h>
    17 #include <factory.h>
     17#ifdef HAVE_FACTORY
     18#  include <factory/factory.h>
     19#endif /* HAVE_FACTORY */
    1820
    1921poly convFactoryPSingP ( const CanonicalForm & f, const ring r=currRing );

  • kernel/clapsing.cc

    rdce1e3 rb1dfaf  
    1010//#define FACTORIZE2_DEBUG
    1111#include <kernel/mod2.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#ifdef HAVE_FACTORY
    1414#define SI_DONT_HAVE_GLOBAL_VARS
    … …  
    1919#include <kernel/ideals.h>
    2020#include <kernel/ffields.h>
    21 #include <factory.h>
     21#include <factory/factory.h>
    2222#include <kernel/clapconv.h>
    23 #include <factor.h>
     23#include <libfac/factor.h>
    2424#include <kernel/ring.h>
    2525

  • kernel/dError.c

    rdce1e3 rb1dfaf  
    1616#include <Singular/distrib.h>
    1717#ifdef HAVE_CONFIG_H
    18 #include <omalloc.h>
     18#include <omalloc/omalloc.h>
    1919#endif
    2020

  • kernel/fast_maps.cc

    rdce1e3 rb1dfaf  
    1010 *******************************************************************/
    1111#include <kernel/mod2.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/options.h>
    1414#include <kernel/p_polys.h>

  • kernel/feResource.cc

    rdce1e3 rb1dfaf  
    2525#if !defined(ESINGULAR) && !defined(TSINGULAR)
    2626#include <kernel/febase.h>
    27 #include <omalloc.h>
     27#include <omalloc/omalloc.h>
    2828#else
    2929char* feResource(const char id, int warn = -1);

  • kernel/febase.cc

    rdce1e3 rb1dfaf  
    1313#include <stdlib.h>
    1414#include <stdio.h>
    15 #include <mylimits.h>
     15#include <omalloc/mylimits.h>
    1616#include <stdarg.h>
    1717#include <sys/stat.h>
    … …  
    2424
    2525#include <kernel/febase.h>
    26 #include <omalloc.h>
     26#include <omalloc/omalloc.h>
    2727#include <kernel/dError.h>
    2828#include <kernel/options.h>

  • kernel/febase.h

    rdce1e3 rb1dfaf  
    2828* let's include our own */
    2929
    30 #include <mylimits.h>
     30#include <omalloc/mylimits.h>
    3131
    3232/* OSF/1 and AIX_4 are missing the header for setenv, but the proc exists */

  • kernel/feread.cc

    rdce1e3 rb1dfaf  
    2121#endif
    2222#include <kernel/febase.h>
    23 #include <omalloc.h>
     23#include <omalloc/omalloc.h>
    2424#include <kernel/options.h>
    2525

  • kernel/fereadl.c

    rdce1e3 rb1dfaf  
    1010#include <kernel/mod2.h>
    1111#include <kernel/febase.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/structs.h>
    1414#include <kernel/febase.h>

  • kernel/ffields.cc

    rdce1e3 rb1dfaf  
    99#include <string.h>
    1010#include <kernel/mod2.h>
    11 #include <mylimits.h>
     11#include <omalloc/mylimits.h>
    1212#include <kernel/febase.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <kernel/numbers.h>
    1515#include <kernel/ring.h>

  • kernel/fglm.h

    rdce1e3 rb1dfaf  
    1515
    1616#ifdef HAVE_FACTORY
    17 #include <factory.h>
     17#include <factory/factory.h>
    1818
    1919#include <kernel/polys.h>

  • kernel/fglmcomb.cc

    rdce1e3 rb1dfaf  
    1818#include <kernel/febase.h>
    1919#include <kernel/maps.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121#include <kernel/fglmvec.h>
    2222#include <kernel/fglmgauss.h>
    2323#include <kernel/kstd1.h>
    2424#define SI_DONT_HAVE_GLOBAL_VARS
    25 #include <factory.h>
     25#include <factory/factory.h>
    2626
    2727#include <kernel/fglm.h>
    28 #include <templates/ftmpl_list.h>
     28#include <factory/templates/ftmpl_list.h>
    2929
    3030#ifndef NOSTREAMIO
    31 #ifdef HAVE_IOSTREAM
    32 #include <iostream>
    33 #else
    34 #include <iostream.h>
    35 #endif
     31#  ifdef HAVE_IOSTREAM
     32#    include <iostream>
     33#  else
     34#    include <iostream.h>
     35#  endif
    3636#endif
    3737

  • kernel/fglmgauss.cc

    rdce1e3 rb1dfaf  
    1616#include <kernel/numbers.h>
    1717#include <kernel/ring.h>
    18 #include <omalloc.h>
     18#include <omalloc/omalloc.h>
    1919
    2020#include <kernel/fglmvec.h>

  • kernel/fglmvec.cc

    rdce1e3 rb1dfaf  
    1616
    1717#ifdef HAVE_FACTORY
    18 #include <omalloc.h>
     18#include <omalloc/omalloc.h>
    1919#include <kernel/structs.h>
    2020#include <kernel/numbers.h>

  • kernel/fglmzero.cc

    rdce1e3 rb1dfaf  
    2828#include <kernel/febase.h>
    2929#include <kernel/maps.h>
    30 #include <omalloc.h>
     30#include <omalloc/omalloc.h>
    3131#include <kernel/kstd1.h>
    3232#include <kernel/intvec.h>

  • kernel/gnumpc.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/structs.h>
    1313#include <kernel/febase.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/numbers.h>
    1616#include <kernel/longrat.h>

  • kernel/gnumpfl.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/structs.h>
    1313#include <kernel/febase.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/numbers.h>
    1616#include <kernel/modulop.h>

  • kernel/hdegree.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/structs.h>
    1313#include <kernel/febase.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/ideals.h>
    1616#include <kernel/polys.h>

  • kernel/hilb.cc

    rdce1e3 rb1dfaf  
    1010#include <kernel/structs.h>
    1111#include <kernel/febase.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/polys.h>
    1414#include <kernel/intvec.h>

  • kernel/hutil.cc

    rdce1e3 rb1dfaf  
    1010#include <kernel/structs.h>
    1111#include <kernel/febase.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/ideals.h>
    1414#include <kernel/polys.h>

  • kernel/ideals.cc

    rdce1e3 rb1dfaf  
    1717
    1818#include <kernel/options.h>
    19 #include <omalloc.h>
     19#include <omalloc/omalloc.h>
    2020#include <kernel/febase.h>
    2121#include <kernel/numbers.h>

  • kernel/int64vec.cc

    rdce1e3 rb1dfaf  
    1111#include <kernel/int64vec.h>
    1212#include <kernel/intvec.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414
    1515/*0 implementation*/

  • kernel/int64vec.h

    rdce1e3 rb1dfaf  
    1010#include <string.h>
    1111#include <kernel/structs.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/febase.h>
    1414#include <kernel/intvec.h>

  • kernel/intvec.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/options.h>
    1313#include <kernel/intvec.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515
    1616/*0 implementation*/

  • kernel/intvec.h

    rdce1e3 rb1dfaf  
    99*/
    1010#include <string.h>
    11 #include <omalloc.h>
     11#include <omalloc/omalloc.h>
    1212#include <kernel/febase.h>
    1313

  • kernel/kInline.cc

    rdce1e3 rb1dfaf  
    1818#include <kernel/p_Procs.h>
    1919#include <kernel/kbuckets.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121
    2222#define HAVE_TAIL_BIN

  • kernel/kbuckets.cc

    rdce1e3 rb1dfaf  
    66#include <kernel/mod2.h>
    77#include <kernel/structs.h>
    8 #include <omalloc.h>
     8#include <omalloc/omalloc.h>
    99#include <kernel/p_polys.h>
    1010#include <kernel/febase.h>

  • kernel/kstd1.cc

    rdce1e3 rb1dfaf  
    1616
    1717#include <kernel/mod2.h>
    18 #include <omalloc.h>
     18#include <omalloc/omalloc.h>
    1919
    2020#ifndef NDEBUG

  • kernel/kstd2.cc

    rdce1e3 rb1dfaf  
    3636#include <kernel/kutil.h>
    3737#include <kernel/options.h>
    38 #include <omalloc.h>
     38#include <omalloc/omalloc.h>
    3939#include <kernel/polys.h>
    4040#include <kernel/ideals.h>

  • kernel/kstdfac.cc

    rdce1e3 rb1dfaf  
    88
    99#include <kernel/mod2.h>
    10 #include <omalloc.h>
     10#include <omalloc/omalloc.h>
    1111#include <kernel/options.h>
    1212#include <kernel/polys.h>

  • kernel/kutil.cc

    rdce1e3 rb1dfaf  
    2121
    2222
    23 #include <mylimits.h>
     23#include <omalloc/mylimits.h>
    2424#include <kernel/options.h>
    2525#include <kernel/gring.h>
    … …  
    4747#include <kernel/kbuckets.h>
    4848#include <kernel/febase.h>
    49 #include <omalloc.h>
     49#include <omalloc/omalloc.h>
    5050#include <kernel/numbers.h>
    5151#include <kernel/polys.h>

  • kernel/kutil.h

    rdce1e3 rb1dfaf  
    1111
    1212#include <string.h>
    13 #include <mylimits.h>
     13#include <omalloc/mylimits.h>
    1414
    1515#include <kernel/structs.h>
    16 #include <omalloc.h>
     16#include <omalloc/omalloc.h>
    1717#include <kernel/ring.h>
    1818#include <kernel/structs.h>

  • kernel/longalg.cc

    rdce1e3 rb1dfaf  
    1111#include <kernel/mod2.h>
    1212#include <kernel/structs.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <kernel/febase.h>
    1515#include <kernel/longrat.h>
    … …  
    2020#include <kernel/ring.h>
    2121#ifdef HAVE_FACTORY
    22 #include <factory.h>
     22#include <factory/factory.h>
    2323#include <kernel/clapsing.h>
    2424#include <kernel/clapconv.h>

  • kernel/longrat.cc

    rdce1e3 rb1dfaf  
    1414#include <kernel/mod2.h>
    1515#include <kernel/structs.h>
    16 #include <omalloc.h>
     16#include <omalloc/omalloc.h>
    1717#include <kernel/febase.h>
    1818#include <kernel/numbers.h>

  • kernel/longrat0.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/mod2.h>
    1313#include <kernel/structs.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/febase.h>
    1616#include <kernel/longrat.h>

  • kernel/maps.cc

    rdce1e3 rb1dfaf  
    1515#include <kernel/ideals.h>
    1616#include <kernel/matpol.h>
    17 #include <omalloc.h>
     17#include <omalloc/omalloc.h>
    1818#include <kernel/kstd1.h>
    1919#include <kernel/longalg.h>

  • kernel/matpol.cc

    rdce1e3 rb1dfaf  
    1212
    1313#include <kernel/mod2.h>
    14 #include <mylimits.h>
     14#include <omalloc/mylimits.h>
    1515#include <kernel/structs.h>
    1616#include <kernel/kstd1.h>
    1717#include <kernel/polys.h>
    18 #include <omalloc.h>
     18#include <omalloc/omalloc.h>
    1919#include <kernel/febase.h>
    2020#include <kernel/numbers.h>

  • kernel/misc.cc

    rdce1e3 rb1dfaf  
    1414
    1515#include <kernel/mod2.h>
    16 #include <mylimits.h>
    17 #include <omalloc.h>
     16#include <omalloc/mylimits.h>
     17#include <omalloc/omalloc.h>
    1818#include <kernel/structs.h>
    1919#include <kernel/options.h>
    … …  
    3333
    3434#ifdef HAVE_FACTORY
    35 #include <factory.h>
     35#  include <factory/factory.h>
    3636/* libfac version strings */
    3737  extern const char * libfac_version;

  • kernel/mmalloc.cc

    rdce1e3 rb1dfaf  
    1010#include <kernel/mod2.h>
    1111
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <new>
    1414

  • kernel/mmstd.c

    rdce1e3 rb1dfaf  
    1111
    1212#define OM_NO_MALLOC_MACROS
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <Singular/static.h>
    1515
    … …  
    2828#define OM_MALLOC_MARK_AS_STATIC
    2929#define strdup_ strdup__
    30 #include <omalloc.c>
     30#include <omalloc/omalloc.c>
    3131#else
    3232#include <stdlib.h>

  • kernel/modulop.cc

    rdce1e3 rb1dfaf  
    99#include <string.h>
    1010#include <kernel/mod2.h>
    11 #include <mylimits.h>
     11#include <omalloc/mylimits.h>
    1212#include <kernel/structs.h>
    1313#include <kernel/febase.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/numbers.h>
    1616#include <kernel/longrat.h>

  • kernel/mpr_base.cc

    rdce1e3 rb1dfaf  
    1313#include <kernel/mod2.h>
    1414
    15 #include <mylimits.h>
    16 #include <omalloc.h>
     15#include <omalloc/mylimits.h>
     16#include <omalloc/omalloc.h>
    1717
    1818//-> includes

  • kernel/mpr_complex.cc

    rdce1e3 rb1dfaf  
    1616#include <kernel/structs.h>
    1717#include <kernel/febase.h>
    18 #include <omalloc.h>
     18#include <omalloc/omalloc.h>
    1919#include <kernel/numbers.h>
    2020#include <kernel/longrat.h>

  • kernel/mpr_inout.cc

    rdce1e3 rb1dfaf  
    1818#include <kernel/ring.h>
    1919#include <kernel/febase.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121#include <kernel/numbers.h>
    2222#include <kernel/matpol.h>

  • kernel/mpr_numeric.cc

    rdce1e3 rb1dfaf  
    1818#include <kernel/options.h>
    1919#include <kernel/febase.h>
    20 #include <omalloc.h>
     20#include <omalloc/omalloc.h>
    2121#include <kernel/numbers.h>
    2222#include <kernel/polys.h>

  • kernel/pDebug.cc

    rdce1e3 rb1dfaf  
    2525#include <kernel/p_polys.h>
    2626#include <kernel/febase.h>
    27 #include <omalloc.h>
     27#include <omalloc/omalloc.h>
    2828#include <kernel/ring.h>
    2929#include <kernel/numbers.h>

  • kernel/pInline1.h

    rdce1e3 rb1dfaf  
    1616// #define PDIV_DEBUG
    1717#endif
    18 #include <mylimits.h>
     18#include <omalloc/mylimits.h>
    1919#include <kernel/p_MemCmp.h>
    2020#include <kernel/structs.h>
    … …  
    5353#if !defined(NO_PINLINE1) || defined(PINLINE1_CC)
    5454
    55 #include <omalloc.h>
     55#include <omalloc/omalloc.h>
    5656#include <kernel/numbers.h>
    5757#include <kernel/p_polys.h>

  • kernel/pInline2.h

    rdce1e3 rb1dfaf  
    2020
    2121#include <kernel/structs.h>
    22 #include <omalloc.h>
     22#include <omalloc/omalloc.h>
    2323#include <kernel/numbers.h>
    2424#include <kernel/p_Procs.h>

  • kernel/polys-impl.cc

    rdce1e3 rb1dfaf  
    2121#include <kernel/mod2.h>
    2222
    23 #include <omalloc.h>
     23#include <omalloc/omalloc.h>
    2424#ifdef PDEBUG
    2525#undef NO_INLINE3

  • kernel/polys-impl.h

    rdce1e3 rb1dfaf  
    1717 ***************************************************************/
    1818#include <kernel/structs.h>
    19 #include <omalloc.h>
     19#include <omalloc/omalloc.h>
    2020
    2121/***************************************************************

  • kernel/polys.cc

    rdce1e3 rb1dfaf  
    1414#include <kernel/mod2.h>
    1515#include <kernel/options.h>
    16 #include <omalloc.h>
     16#include <omalloc/omalloc.h>
    1717#include <kernel/febase.h>
    1818#include <kernel/numbers.h>

  • kernel/polys1.cc

    rdce1e3 rb1dfaf  
    1515#include <kernel/numbers.h>
    1616#include <kernel/ffields.h>
    17 #include <omalloc.h>
     17#include <omalloc/omalloc.h>
    1818#include <kernel/febase.h>
    1919#include <kernel/weight.h>

  • kernel/prCopy.cc

    rdce1e3 rb1dfaf  
    88
    99#include <kernel/mod2.h>
    10 #include <omalloc.h>
     10#include <omalloc/omalloc.h>
    1111#include <kernel/p_polys.h>
    1212#include <kernel/numbers.h>

  • kernel/ring.cc

    rdce1e3 rb1dfaf  
    1919
    2020#include <kernel/options.h>
    21 #include <omalloc.h>
     21#include <omalloc/omalloc.h>
    2222#include <kernel/polys.h>
    2323#include <kernel/numbers.h>
    … …  
    3838#include <kernel/matpol.h>
    3939#ifdef HAVE_FACTORY
    40 #include <factory.h>
     40#  include <factory/factory.h>
    4141#endif
    4242

  • kernel/ringgb.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/kutil.h>
    1313#include <kernel/structs.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/polys.h>
    1616#include <kernel/p_polys.h>

  • kernel/rintegers.cc

    rdce1e3 rb1dfaf  
    99#include <string.h>
    1010#include <kernel/mod2.h>
    11 #include <mylimits.h>
     11#include <omalloc/mylimits.h>
    1212#include <kernel/structs.h>
    1313#include <kernel/febase.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/numbers.h>
    1616#include <kernel/longrat.h>

  • kernel/rmodulo2m.cc

    rdce1e3 rb1dfaf  
    1111
    1212#ifdef HAVE_RINGS
    13 #include <mylimits.h>
     13#include <omalloc/mylimits.h>
    1414#include <kernel/structs.h>
    1515#include <kernel/febase.h>
    16 #include <omalloc.h>
     16#include <omalloc/omalloc.h>
    1717#include <kernel/numbers.h>
    1818#include <kernel/longrat.h>

  • kernel/rmodulon.cc

    rdce1e3 rb1dfaf  
    99#include <string.h>
    1010#include <kernel/mod2.h>
    11 #include <mylimits.h>
     11#include <omalloc/mylimits.h>
    1212#include <kernel/structs.h>
    1313#include <kernel/febase.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/numbers.h>
    1616#include <kernel/longrat.h>

  • kernel/sbuckets.cc

    rdce1e3 rb1dfaf  
    1313
    1414#include <kernel/sbuckets.h>
    15 #include <omalloc.h>
     15#include <omalloc/omalloc.h>
    1616#include <kernel/ring.h>
    1717#include <kernel/p_Procs.h>

  • kernel/shiftgb.cc

    rdce1e3 rb1dfaf  
    2222#include <kernel/kutil.h>
    2323#include <kernel/structs.h>
    24 #include <omalloc.h>
     24#include <omalloc/omalloc.h>
    2525#include <kernel/khstd.h>
    2626#include <kernel/kbuckets.h>

  • kernel/shortfl.cc

    rdce1e3 rb1dfaf  
    1010#include <string.h>
    1111#include <kernel/mod2.h>
    12 #include <mylimits.h>
     12#include <omalloc/mylimits.h>
    1313#include <kernel/structs.h>
    1414#include <kernel/febase.h>

  • kernel/si_gmp.h

    rdce1e3 rb1dfaf  
    44#define INCL_CF_GMP_H
    55#ifdef HAVE_FACTORY
    6 #include <cf_gmp.h>
     6#  include <factory/cf_gmp.h>
    77#else
    88#if defined(__cplusplus) && defined(__GNUC__)

  • kernel/spectrum.cc

    rdce1e3 rb1dfaf  
    1919#endif
    2020
    21 #include <mylimits.h>
     21#include <omalloc/mylimits.h>
    2222
    2323#include <kernel/numbers.h>

  • kernel/structs.h

    rdce1e3 rb1dfaf  
    1212#include <string.h>
    1313/* for omBin */
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#ifdef HAVE_RINGS
    1616#include <kernel/si_gmp.h>

  • kernel/syz.cc

    rdce1e3 rb1dfaf  
    1111#include <kernel/mod2.h>
    1212#include <kernel/options.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <kernel/polys.h>
    1515#include <kernel/febase.h>
    … …  
    471471    }
    472472  }
     473
     474#ifdef HAVE_PLURAL
    473475  if (rIsPluralRing(currRing) && !rIsSCA(currRing) )
    474476  {
    … …  
    476478    hom = isNotHomog;
    477479  }
     480#endif // HAVE_PLURAL
     481
    478482  if (hom==isHomog)
    479483  {

  • kernel/syz0.cc

    rdce1e3 rb1dfaf  
    1010#include <kernel/mod2.h>
    1111#include <kernel/options.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/polys.h>
    1414#include <kernel/febase.h>

  • kernel/syz1.cc

    rdce1e3 rb1dfaf  
    88
    99#include <kernel/mod2.h>
    10 #include <mylimits.h>
     10#include <omalloc/mylimits.h>
    1111#include <kernel/options.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/polys.h>
    1414#include <kernel/febase.h>

  • kernel/syz2.cc

    rdce1e3 rb1dfaf  
    88
    99#include <kernel/mod2.h>
    10 #include <mylimits.h>
     10#include <omalloc/mylimits.h>
    1111#include <kernel/options.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/syz.h>
    1414#include <kernel/polys.h>

  • kernel/syz3.cc

    rdce1e3 rb1dfaf  
    88 
    99#include <kernel/mod2.h>
    10 #include <mylimits.h>
     10#include <omalloc/mylimits.h>
    1111#include <kernel/options.h>
    12 #include <omalloc.h>
     12#include <omalloc/omalloc.h>
    1313#include <kernel/polys.h>
    1414#include <kernel/febase.h>

  • kernel/tgb_internal.h

    rdce1e3 rb1dfaf  
    99 * ABSTRACT: tgb internal .h file
    1010*/
    11 #include <omalloc.h>
     11#include <omalloc/omalloc.h>
    1212#include <kernel/p_polys.h>
    1313

  • kernel/tgbgauss.cc

    rdce1e3 rb1dfaf  
    99#include <kernel/options.h>
    1010#include <kernel/tgbgauss.h>
    11 #include <omalloc.h>
     11#include <omalloc/omalloc.h>
    1212#include <stdlib.h>
    1313#include <kernel/kutil.h>

  • kernel/walkProc.cc

    rdce1e3 rb1dfaf  
    1212#include <kernel/febase.h>
    1313#include <kernel/maps.h>
    14 #include <omalloc.h>
     14#include <omalloc/omalloc.h>
    1515#include <kernel/kstd1.h>
    1616#include <kernel/fglm.h>

  • kernel/weight.cc

    rdce1e3 rb1dfaf  
    1111#include <kernel/mod2.h>
    1212#include <kernel/options.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <kernel/polys.h>
    1515#include <kernel/intvec.h>

  • kernel/weight0.c

    rdce1e3 rb1dfaf  
    1111#include <string.h>
    1212#include <kernel/mod2.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <kernel/structs.h>
    1515

  • libfac/Makefile.in

    rdce1e3 rb1dfaf  
    3838CXXFLAGS        = @CXXFLAGS@
    3939CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@
    40 CPPFLAGS        = -I${srcdir}/factor -I${srcdir}/charset -I${srcdir} @CPPFLAGS@
     40CPPFLAGS        = -I${srcdir}/factor -I${srcdir}/charset -I${srcdir} -I.. -I${prefix} @CPPFLAGS@
    4141DEFS            = @DEFS@
    4242LDFLAGS         = @LDFLAGS@

  • libfac/factor.h

    rdce1e3 rb1dfaf  
    66#define FACTOR_H
    77
    8 #include <factory.h>
     8#include <factory/factory.h>
    99
    1010// Set this to a nonzero value to interrupt the computation

  • omalloc/Makefile.in

    rdce1e3 rb1dfaf  
    1313## various paths
    1414##
     15top_srcdir      = @top_srcdir@
     16srcdir          = @srcdir@
    1517prefix          = @prefix@
    1618exec_prefix     = @exec_prefix@
    … …  
    3840##
    3941CFLAGS          = @CFLAGS@
    40 CPPFLAGS        = -I. @CPPFLAGS@ -I@prefix@
     42CPPFLAGS        = -I. @CPPFLAGS@ -I@prefix@ -I..
    4143DEFS            = @DEFS@
    4244
Note: See TracChangeset for help on using the changeset viewer.