Changeset c753931 in git

Timestamp:

Oct 11, 2007, 11:46:38 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c3735b120c178ba2f64d8c775753d3ac21e5432b

Parents:

6742c89cf0ef92778f8b9ab55e697d7ff897f47a

Message:

*albrecht: SAGE diffs


git-svn-id: file:///usr/local/Singular/svn/trunk@10328 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/Makefile.in (modified) (4 diffs)
• Singular/libsingular.h (modified) (1 diff)
• omalloc/Makefile.in (modified) (3 diffs)
• singuname.sh (modified) (1 diff)

Singular/Makefile.in

@@ -105 +105 @@
 
 SO_SUFFIX = so
-LIBSINGULAR_FLAGS = -export-dynamic 
+#LIBSINGULAR_FLAGS = -export-dynamic 
 LIBSINGULAR_LD = $(CXX)
 
@@ -490 +490 @@
         ${MKINSTALLDIRS} ${bindir}
         ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-        -${INSTALL_PROGRAM} *.so ${bindir}
+        -for file in *.so; do \
+          ${INSTALL_PROGRAM} $$file ${bindir}; \
+        done
         ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
         ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
@@ -501 +503 @@
         ${MKINSTALLDIRS} ${bindir}
         ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-        -${INSTALL_PROGRAM} *.so ${bindir}
+        -for file in *.so; do \
+          ${INSTALL_PROGRAM} $$file ${bindir}; \
+        done
         ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
         ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
         chmod a+x ${SINGULAR}
         rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
-        cd ${bindir}; ${INSTALL_PROGRAM} ${SINGULAR} Singular${EXEC_EXT};
+        ${INSTALL_PROGRAM} ${SINGULAR} ${bindir}/Singular${EXEC_EXT};
 
 installslib: LIB
@@ -513 +517 @@
 installslib-nolns: LIB
         ${MKINSTALLDIRS} ${slibdir}
-        ${INSTALL} `pwd`/LIB/*.lib ${slibdir}
+        for file in `pwd`/LIB/*.lib; do \
+          ${INSTALL}  $$file ${slibdir}; \
+        done
         ${MKINSTALLDIRS} ${slibdir}/gftables
         ${INSTALL} `pwd`/LIB/gftables/* ${slibdir}/gftables/
 
 install-libsingular: libsingular
-        ${INSTALL_PROGRAM} *.$(SO_SUFFIX) ${libdir}
+        for file in *.$(SO_SUFFIX); do \
+          ${INSTALL_PROGRAM}  $$file ${libdir}; \
+        done
         ${INSTALL_PROGRAM} libsingular.h ${includedir}
 

Singular/libsingular.h

@@ -15 +15 @@
 #include "singular/fast_maps.h"
 #include "singular/kstd1.h"
+#include "singular/tgb.h"
+#include "singular/sparsmat.h"
 
 int siInit(char *);

omalloc/Makefile.in

@@ -4 +4 @@
 ### Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
 ### Created: 11/99
-### Version: $Id: Makefile.in,v 1.21 2007-08-03 11:32:05 Singular Exp $
+### Version: $Id: Makefile.in,v 1.22 2007-10-11 09:46:37 Singular Exp $
 #################################################################
 
@@ -203 +203 @@
         $(INSTALL_DATA) libomalloc_p.a $(libdir)
         $(RANLIB) $(libdir)/libomalloc_p.a
-        $(INSTALL_DATA) omalloc.o omalloc_debug.o $(libdir)
-        $(INSTALL_DATA) omalloc.h omalloc.c $(includedir)
-        $(INSTALL_DATA) omlimits.h mylimits.h omalloc.c $(includedir)
+        $(INSTALL_DATA) omalloc.o $(libdir)
+        $(INSTALL_DATA) omalloc_debug.o $(libdir)
+        $(INSTALL_DATA) omalloc.h $(includedir)
+        $(INSTALL_DATA) omalloc.c $(includedir)
+        $(INSTALL_DATA) omlimits.h $(includedir)
+        $(INSTALL_DATA) mylimits.h $(includedir)
 
 install_min: libomalloc_ndebug.a omalloc.o
@@ -213 +216 @@
         $(RANLIB) $(libdir)/libomalloc_ndebug.a
         $(INSTALL_DATA) omalloc.o $(libdir)
-        $(INSTALL_DATA) omalloc.h omalloc.c $(includedir)
-        $(INSTALL_DATA) omlimits.h mylimits.h omalloc.c $(includedir)
+        $(INSTALL_DATA) omalloc.h $(includedir)
+        $(INSTALL_DATA) omalloc.c $(includedir)
+        $(INSTALL_DATA) omlimits.h $(includedir)
+        $(INSTALL_DATA) mylimits.h $(includedir)
 
 uninstall:

singuname.sh

@@ -81 +81 @@
     elif (echo $uname_a | $egrep "SunOS" >$devnull)
     then
+      # NexentaOS ###############
+      if (echo $uname_a | $egrep "NexentaOS" > $devnull)
+      then
+        echo ${prefix}-nexentaos
+      else
         echo ix86-SunOS
-        exit 0
+      fi
+      exit 0
     else
         echo ${prefix}-Unknown