[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 79d12f7aef94c48d74f5379bc6a57060f35dc293
Author: Yue Ren <ren at mathematik.uni-kl.de>
Date:   Wed Feb 15 18:27:03 2012 +0100

    changed callpolymake building process
    
    now on every system buildable which has polymake

diff --git a/callgfanlib/Makefile b/callgfanlib/Makefile
index 2be8862..3542982 100755
--- a/callgfanlib/Makefile
+++ b/callgfanlib/Makefile
@@ -1,10 +1,10 @@
 all: gfanlib
 
 gfanlib: 
-	g++ -DOM_DEBUG -DNDEBUG -o bbcone.o -fpic -I/home/ren/Sources/ -c -g bbcone.cc
-	g++ -DOM_DEBUG -DNDEBUG -o bbfan.o -fpic -I/home/ren/Sources/ -c -g bbfan.cc
-	g++ -DOM_DEBUG -DNDEBUG -o bbpolytope.o -fpic -I/home/ren/Sources/ -c -g bbpolytope.cc
-	g++ -DOM_DEBUG -DNDEBUG -o gfanlib.o -fpic -I/home/ren/Sources/ -c -g gfanlib.cc
+	g++ -DOM_DEBUG -DNDEBUG -o bbcone.o -fpic -I../ -c -g bbcone.cc
+	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 
 
 clean:
diff --git a/callpolymake/Makefile b/callpolymake/Makefile
index 13dda21..e67971d 100755
--- a/callpolymake/Makefile
+++ b/callpolymake/Makefile
@@ -3,14 +3,14 @@ PM_CFLAGS := -fPIC -DPOLYMAKE_DEBUG=0
 PM_LIBS := $(shell polymake-config --libs)
 PM_LDFLAGS := $(shell polymake-config --ldflags)
 
-CFLAGS += -march=native
+CFLAGS += -march=native -DOM_NDEBUG -DNDEBUG
 LDFLAGS += -Wl,-rpath,/usr/local/include/polymake/ -lxml2
 
 all: polymake
 
 polymake: 
-	g++ -o polymake.o -I. ${PM_INC} ${PM_CFLAGS} ${CFLAGS} ${PM_LDFLAGS} ${PM_LIBS} -I/home/ren/Sources/ -c -g polymake.cc
-	g++ -shared -o polymake.so ${PM_INC} ${PM_CFLAGS} ${CFLAGS} ${PM_LDFLAGS} ${PM_LIBS} ${LDFLAGS} -lgmpxx -lgmp -g polymake.o
+	g++ -o polymake.o -I. ${PM_INC} ${PM_CFLAGS} ${CFLAGS} ${LDFLAGS} -I../ -c -g polymake.cc
+	g++ -shared -o polymake.so ${PM_LDFLAGS} ${LDFLAGS} -g polymake.o ${PM_LIBS} -lgmpxx -lgmp 
 
 clean:
 	rm *.so *.o
diff --git a/callpolymake/polymake.cc b/callpolymake/polymake.cc
index e43619a..ca3a902 100755
--- a/callpolymake/polymake.cc
+++ b/callpolymake/polymake.cc
@@ -1,10 +1,10 @@
-#include </usr/local/include/polymake/Main.h>
-#include </usr/local/include/polymake/Matrix.h>
-#include </usr/local/include/polymake/Rational.h>
-#include </usr/local/include/polymake/Integer.h>
-#include </usr/local/include/polymake/perl/macros.h>
-#include </usr/local/include/polymake/Set.h>
-#include </usr/local/include/polymake/next/IncidenceMatrix.h>
+#include <polymake/Main.h>
+#include <polymake/Matrix.h>
+#include <polymake/Rational.h>
+#include <polymake/Integer.h>
+#include <polymake/perl/macros.h>
+#include <polymake/Set.h>
+#include <polymake/IncidenceMatrix.h>
 
 #include <gfanlib/gfanlib.h>
 #include <gfanlib/gfanlib_q.h>

-- 
an open source computer algebra system