Changeset b1dfaf in git for factory


Ignore:
Timestamp:
Sep 17, 2010, 3:36:19 PM (14 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
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
Location:
factory
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.