Changeset a1ab2a in git


Ignore:
Timestamp:
Aug 3, 2007, 1:32:05 PM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')
Children:
bd921098e4abc1a533ad903537ad0b636263f797
Parents:
672950eb7b5e5440880be38074eccfe7bcb3ccb4
Message:
*hannes: SAGE/libsingular


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

Legend:

Unmodified
Added
Removed
  • IntegerProgramming/Makefile.in

    r672950e ra1ab2a  
    5252
    5353all: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
     54
     55install-nolns: install
    5456
    5557install: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
  • Makefile.in

    r672950e ra1ab2a  
    5555        echo "* do not forget to install Singular-@SINGULAR_VERSION@-share.tar.gz"
    5656
     57install-nolns:
     58        @ for SUBDIR in ${BUILD1_SUBDIRS}; \
     59        do \
     60          echo ${MAKE} $@ in $${SUBDIR}; \
     61          (cd $${SUBDIR} && ${MAKE} $@ )  || exit 1;\
     62          (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
     63            for FILE in ${TEXINFO_TEX_FILES}; \
     64            do \
     65              if test "$@" = uninstall; then\
     66                echo rm -f doc/$${FILE};\
     67                rm -f doc/$${FILE}; \
     68              else \
     69                echo cp ${TEXINFO_TEX_DIR}/$${FILE} doc; \
     70                cp ${TEXINFO_TEX_DIR}/$${FILE} doc; \
     71              fi; \
     72            done;\
     73          fi;); \
     74        done
     75        echo "* do not forget to install Singular-@SINGULAR_VERSION@-share.tar.gz"
     76
     77libsingular:
     78        cd Singular; make libsingular
     79
     80install-libsingular: libsingular
     81        (cd Singular && make install-libsingular);
     82        (cd kernel && make install-libsingular);
     83        (cd omalloc && make install-libsingular);
    5784
    5885maintainer-install uninstall:
  • Singular/Makefile.in

    r672950e ra1ab2a  
    102102# Handle libSINGULAR stuff
    103103#
     104LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc_ndebug
    104105
    105106SO_SUFFIX = so
     
    115116
    116117ifeq ($(SINGUNAME),ppcMac-darwin)
     118MACOSX_DEPLOYMENT_TARGET=10.4
    117119SO_SUFFIX        = dylib
    118 LIBSINGULAR_FLAGS = -singule_module
     120LIBSINGULAR_FLAGS = -single_module
    119121LIBSINGULAR_LD = $(LD)
    120122endif
    121123
    122 LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc_ndebug
     124ifeq ($(SINGUNAME),ix86-Win)
     125SO_SUFFIX = dll
     126LIBSINGULAR_FLAGS = --shared
     127LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc_ndebug  -lhtmlhelp
     128endif
    123129
    124130#
     
    330336        $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
    331337        libsingular-tesths.o iparith.o mpsr_Tok.o claptmpl.o \
    332         ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS} ../kernel/mmalloc.o
     338        ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
    333339
    334340libsingular-tesths.o: tesths.cc
     
    499505
    500506installslib-nolns: LIB
    501         test -r ${slibdir} || ${INSTALL} -d `pwd`/LIB ${slibdir}
     507        ${MKINSTALLDIRS} ${slibdir}
    502508        ${INSTALL} `pwd`/LIB/*.lib ${slibdir}
    503509        ${MKINSTALLDIRS} ${slibdir}/gftables
  • Singular/tesths.cc

    r672950e ra1ab2a  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.109 2006-09-27 17:46:12 Singular Exp $ */
     4/* $Id: tesths.cc,v 1.110 2007-08-03 11:32:04 Singular Exp $ */
    55
    66/*
     
    4141const char *singular_date=__DATE__ " " __TIME__;
    4242
     43#ifdef LIBSINGULAR
     44int siInit(char *name)
     45{
     46  // hack such that all shared' libs in the bindir are loaded correctly
     47  feInitResources(name);
     48}
     49#endif
     50
     51#if not defined LIBSINGULAR or defined GENTABLE
    4352/*0 implementation*/
    4453int main(          /* main entry to Singular */
     
    244253  return 0;
    245254}
    246 
     255#endif // not LIBSINGULAR
     256
  • factory/GNUmakefile.in

    r672950e ra1ab2a  
    11# @configure_input@
    2 # $Id: GNUmakefile.in,v 1.48 2007-07-31 12:57:59 Singular Exp $
     2# $Id: GNUmakefile.in,v 1.49 2007-08-03 11:32:04 Singular Exp $
    33
    44#
     
    582582install:        $(installtargets)
    583583
     584install-nolns: install
     585
    584586installcf:      cf
    585587                $(MKINSTALLDIRS) $(libdir)
  • factory/cf_factor.cc

    r672950e ra1ab2a  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: cf_factor.cc,v 1.32 2007-04-26 08:22:48 Singular Exp $ */
     2/* $Id: cf_factor.cc,v 1.33 2007-08-03 11:32:04 Singular Exp $ */
    33
    44//{{{ docu
     
    121121    }
    122122    else //printf("+...");
    123        cout << f;
     123       std::cout << f;
    124124    //if (f.inZ()) printf("(Z)");
    125125    //else if (f.inQ()) printf("(Q)");
  • kernel/Makefile.in

    r672950e ra1ab2a  
    313313## install targets
    314314##
     315install-nolns: install
     316
     317install-libsingular:
     318        ${MKINSTALLDIRS} ${includedir}/singular
     319        ${INSTALL} *.h ${includedir}/singular
     320
    315321install: all installbin
    316322
  • kernel/longrat.cc

    r672950e ra1ab2a  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: longrat.cc,v 1.23 2007-07-27 07:37:53 Singular Exp $ */
     4/* $Id: longrat.cc,v 1.24 2007-08-03 11:32:05 Singular Exp $ */
    55/*
    66* ABSTRACT: computation with long rational numbers (Hubert Grassmann)
     
    20772077}
    20782078
     2079number nlInit2gmp (mpz_t i, mpz_t j)
     2080{
     2081  number z=(number)omAllocBin(rnumber_bin);
     2082#if defined(LDEBUG)
     2083  z->debug=123456;
     2084#endif
     2085  mpz_init_set(&z->z,i);
     2086  mpz_init_set(&z->n,j);
     2087  z->s = 0;
     2088  nlNormalize(z);
     2089  return z;
     2090}
     2091
    20792092#else // DO_LINLINE
    20802093
  • kernel/longrat.h

    r672950e ra1ab2a  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: longrat.h,v 1.6 2007-03-15 14:24:03 Singular Exp $ */
     6/* $Id: longrat.h,v 1.7 2007-08-03 11:32:05 Singular Exp $ */
    77/*
    88* ABSTRACT: computation with long rational numbers
     
    6161
    6262number   nlInit2 (int i, int j);
     63number   nlInit2gmp (mpz_t i, mpz_t j);
    6364number   nlGcd(number a, number b, const ring r);
    6465number   nlLcm(number a, number b, const ring r);   /*special routine !*/
  • libfac/Makefile.in

    r672950e ra1ab2a  
    1 # $Id: Makefile.in,v 1.11 2003-04-09 13:39:11 Singular Exp $
     1# $Id: Makefile.in,v 1.12 2007-08-03 11:32:05 Singular Exp $
    22#################################################
    33SHELL           = /bin/sh
     
    147147                $(RANLIB) ${SINGLIBFACNAME}.a
    148148
     149install-nolns: install
     150
    149151install:        all
    150152        ${MKINSTALLDIRS} ${includedir}
  • omalloc/Makefile.in

    r672950e ra1ab2a  
    44### Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
    55### Created: 11/99
    6 ### Version: $Id: Makefile.in,v 1.20 2007-01-23 22:13:05 krueger Exp $
     6### Version: $Id: Makefile.in,v 1.21 2007-08-03 11:32:05 Singular Exp $
    77#################################################################
    88
     
    188188## install targets
    189189##
     190install-nolns: install
     191
     192install-libsingular:
     193        $(MKINSTALLDIRS) $(includedir)/singular
     194        $(INSTALL) omalloc.h $(includedir)/singular
     195
    190196install: all libomalloc_p.a
    191197        $(MKINSTALLDIRS) $(libdir)
Note: See TracChangeset for help on using the changeset viewer.