[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 16791b44c6edd49d5d2cd15092d527c5d1604f4c
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Fri Feb 24 19:13:12 2012 +0100

    chg: make gfanlib.so compile

diff --git a/Singular/extra.cc b/Singular/extra.cc
index 9a8f021..eb2506e 100644
--- a/Singular/extra.cc
+++ b/Singular/extra.cc
@@ -62,7 +62,7 @@
 #endif
 
 #ifdef HAVE_FANS
-#include <kernel/gfan.h>
+#include <callgfanlib/gfan.h>
 #include <gfanlib/gfanlib.h>
 #endif
 
diff --git a/callgfanlib/Makefile b/callgfanlib/Makefile
index 6312633..51543f7 100755
--- a/callgfanlib/Makefile
+++ b/callgfanlib/Makefile
@@ -5,7 +5,8 @@ gfanlib:
 	g++ -DOM_DEBUG -DNDEBUG -o bbfan.o -fpic -I../ -c -g bbfan.cc
 	g++ -DOM_DEBUG -DNDEBUG -o bbpolytope.o -fpic -I../ -c -g bbpolytope.cc
 	g++ -DOM_DEBUG -DNDEBUG -o gfanlib.o -fpic -I../ -c -g gfanlib.cc
-	g++ -shared -o gfanlib.so bbcone.o bbfan.o bbpolytope.o gfanlib.o ../gfanlib/*.o -L/usr/local/lib -lcddgmp -lgmpxx 
+	g++ -DOM_DEBUG -DNDEBUG -o gfan.o -fpic -I../ -c -g gfan.cc
+	g++ -shared -o gfanlib.so bbcone.o bbfan.o bbpolytope.o gfanlib.o gfan.o ../gfanlib/*.o -L/usr/local/lib -lcddgmp -lgmpxx 
 	cp gfanlib.so ../Singular/gfanlib.so
 
 clean:
diff --git a/kernel/gfan.cc b/callgfanlib/gfan.cc
similarity index 99%
rename from kernel/gfan.cc
rename to callgfanlib/gfan.cc
index d94d7ed..a9b4bb7 100644
--- a/kernel/gfan.cc
+++ b/callgfanlib/gfan.cc
@@ -17,7 +17,7 @@ $Id: gfan.cc 14271 2011-06-10 08:00:12Z monerjan $
 #include <kernel/kmatrix.h>
 #include <kernel/GMPrat.h>
 
-#include "ring.h"	//apparently not needed
+//#include "ring.h"	//apparently not needed
 #include <Singular/lists.h>
 #include <kernel/prCopy.h>
 #include <kernel/stairc.h>
@@ -61,7 +61,7 @@ $Id: gfan.cc 14271 2011-06-10 08:00:12Z monerjan $
   #define USE_ZFAN
 #endif
 
-#include <gfan.h>
+#include <callgfanlib/gfan.h>
 using namespace std;
 
 #define ivIsStrictlyPositive iv64isStrictlyPositive
@@ -287,7 +287,7 @@ static bool areEqual(facet *f, facet *s)
 	const int64vec* sNormal;
 	fNormal = f->getRef2FacetNormal();
 	sNormal = s->getRef2FacetNormal();
-#include "intvec.h"
+#include <kernel/intvec.h>
 	//Do not need parallelity. Too time consuming
 //  	if(!isParallel(*fNormal,*sNormal))
 // 	if(fNormal->compare(ivNeg(sNormal))!=0)//This results in a Mandelbug
diff --git a/kernel/gfan.h b/callgfanlib/gfan.h
similarity index 99%
rename from kernel/gfan.h
rename to callgfanlib/gfan.h
index 19de342..3899261 100644
--- a/kernel/gfan.h
+++ b/callgfanlib/gfan.h
@@ -26,7 +26,7 @@ extern int gfanHeuristic;
 #ifndef USE_ZFAN
   lists grfan(ideal inputIdeal, int heuristic, bool singleCone);
 #else
-  #include <../gfanlib/gfanlib.h>
+  #include <gfanlib/gfanlib.h>
   gfan::ZFan *grfan(ideal inputIdeal, int h, bool singleCone);
 #endif
 // lists grcone_by_intvec(ideal inputIdeal);
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 13db562..1be1b69 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -114,7 +114,7 @@ CXXSOURCES=clapconv.cc \
     pDebug.cc pInline2.cc pInline1.cc pInline0.cc \
     pShallowCopyDelete.cc fast_mult.cc digitech.cc \
     tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc \
-    f5c.cc F5cLists.cc ratgring.cc shiftgb.cc gfan.cc \
+    f5c.cc F5cLists.cc ratgring.cc shiftgb.cc \
     linearAlgebra.cc longtrans.cc
 CXXSOURCES2	= SingularBuilder.cpp
 
@@ -175,7 +175,7 @@ HEADERS=hutil.h idrec.h stairc.h ideals.h \
         pInline2.h pInline1.h pInline0.h mmalloc.h \
         pShallowCopyDelete.h \
 	p_Procs_Dynamic.h p_Procs_Impl.h p_Procs_Set.h \
-	p_Procs.h p_Procs_Static.h p_Mult_q.h gfan.h
+	p_Procs.h p_Procs_Static.h p_Mult_q.h
 
 DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \
         Makefile.in \

-- 
an open source computer algebra system