Changeset f9f879 in git

Timestamp:

Jul 19, 2010, 10:46:59 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

cf21dd42f35f06862c90e2223eea0f33e4ff0fbc

Parents:

3c473cd1025f9dec9b7bf4cbe33d713158cac80f

Message:

fix for makefile and includes

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

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• extra.cc (modified) (1 diff)
• mpsr_GetMisc.cc (modified) (2 diffs)
• mpsr_GetPoly.cc (modified) (1 diff)
• mpsr_PutPoly.cc (modified) (1 diff)
• slInit_Dynamic.cc (modified) (1 diff)

Singular/Makefile.in

@@ -55 +55 @@
 CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@ -I@prefix@
 ifneq ($(SINGUNAME),ix86-Win)
-CPPFLAGS        = -I${srcdir} -I@prefix@ @CPPFLAGS@
+CPPFLAGS        = -I${srcdir} -I../kernel -I@prefix@ @CPPFLAGS@
 else
 ## Dirs after @CPPFLAGS@ are for PySingular

Singular/extra.cc

@@ -1985 +1985 @@
 #include <hc_newton.h>
 #endif
-#include <Singular/mpsr.h>
+#include <mpsr.h>
 #include <kernel/mod_raw.h>
 #include <kernel/ring.h>

Singular/mpsr_GetMisc.cc

@@ -19 +19 @@
 
 #include <Singular/mpsr_Get.h>
-#include <Singular/longalg.h>
+#include "longalg.h"
 #include <Singular/tok.h>
 #include <kernel/maps.h>
@@ -436 +436 @@
 #undef freeSize
 
-#include <Singular/mmalloc.h>
+#include "mmalloc.h"
 
 static int mpsr_is_initialized = 0;

Singular/mpsr_GetPoly.cc

@@ -16 +16 @@
 
 #ifdef HAVE_MPSR
-#include <Singular/mylimits.h>
+#include "mylimits.h"
 
 #include <Singular/mpsr_Get.h>
 
-#include <Singular/si_gmp.h>
+#include <si_gmp.h>
 #include <omalloc.h>
 #include <Singular/tok.h>
 #include <Singular/ipid.h>
 #include <kernel/ring.h>
-#include <Singular/longalg.h>
+#include "longalg.h"
 #include <kernel/maps.h>
 #include <kernel/ideals.h>
 #include <Singular/grammar.h>
 #include <kernel/febase.h>
-#include <Singular/modulop.h>
+#include "modulop.h"
 
 #include <Singular/mpsr_Tok.h>

Singular/mpsr_PutPoly.cc

@@ -22 +22 @@
 #include <Singular/mpsr_Put.h>
 #include <Singular/mpsr_Tok.h>
-#include <Singular/longalg.h>
+#include "longalg.h"
 #include <omalloc.h>
 #include <kernel/ring.h>

Singular/slInit_Dynamic.cc

@@ -22 +22 @@
 #ifdef HAVE_DL
 #ifdef HAVE_MPSR
-#include <Singular/MP.h>
-#include <Singular/mpsr_sl.h>
+#include <MP.h>
+#include "mpsr_sl.h"
 
 static void* mpsr_so_handle = NULL;