From af5b3ea85f8d8cb7ddb5b24c1658d60e34b0bbc0 Mon Sep 17 00:00:00 2001 From: graham Date: Wed, 19 Aug 2009 18:35:06 +0100 Subject: [PATCH] Revert "Modifying c++ rules to increase template depth for CGAL compilation." This reverts commit 5050e9e61fca51be12295dfe3aa85540dde856e6. -lrt nor needed in src/decompositionMethods/decompositionMethods/Make/options --- src/decompositionMethods/decompositionMethods/Make/options | 3 +-- wmake/rules/SiCortex64Gcc/c++ | 2 +- wmake/rules/SunOS64Gcc/c++ | 2 +- wmake/rules/linux64Gcc/c++ | 2 +- wmake/rules/linux64Gcc42/c++ | 2 +- wmake/rules/linux64Gcc43/c++ | 2 +- wmake/rules/linux64Gcc44/c++ | 2 +- wmake/rules/linuxGcc/c++ | 2 +- wmake/rules/linuxGcc42/c++ | 2 +- wmake/rules/linuxGcc43/c++ | 2 +- wmake/rules/linuxGcc44/c++ | 2 +- wmake/rules/linuxIA64Gcc/c++ | 2 +- wmake/rules/linuxPPC64Gcc/c++ | 2 +- wmake/rules/linuxmingw32/c++ | 2 +- wmake/rules/solarisGcc/c++ | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/decompositionMethods/decompositionMethods/Make/options b/src/decompositionMethods/decompositionMethods/Make/options index dd2a5a39bd..97569aa663 100644 --- a/src/decompositionMethods/decompositionMethods/Make/options +++ b/src/decompositionMethods/decompositionMethods/Make/options @@ -5,5 +5,4 @@ EXE_INC = \ LIB_LIBS = \ -lscotch \ -lmetis \ - -lGKlib \ - -lrt + -lGKlib diff --git a/wmake/rules/SiCortex64Gcc/c++ b/wmake/rules/SiCortex64Gcc/c++ index 13e0a3e1fa..f0a8cf5041 100644 --- a/wmake/rules/SiCortex64Gcc/c++ +++ b/wmake/rules/SiCortex64Gcc/c++ @@ -7,7 +7,7 @@ CC = g++ -mabi=64 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = -G0 $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/SunOS64Gcc/c++ b/wmake/rules/SunOS64Gcc/c++ index 677b1e5bb4..36b5c29b20 100644 --- a/wmake/rules/SunOS64Gcc/c++ +++ b/wmake/rules/SunOS64Gcc/c++ @@ -6,7 +6,7 @@ CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++ index c96c754aaa..9d074e2715 100644 --- a/wmake/rules/linux64Gcc/c++ +++ b/wmake/rules/linux64Gcc/c++ @@ -6,7 +6,7 @@ CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linux64Gcc42/c++ b/wmake/rules/linux64Gcc42/c++ index 677b1e5bb4..36b5c29b20 100644 --- a/wmake/rules/linux64Gcc42/c++ +++ b/wmake/rules/linux64Gcc42/c++ @@ -6,7 +6,7 @@ CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linux64Gcc43/c++ b/wmake/rules/linux64Gcc43/c++ index 677b1e5bb4..36b5c29b20 100644 --- a/wmake/rules/linux64Gcc43/c++ +++ b/wmake/rules/linux64Gcc43/c++ @@ -6,7 +6,7 @@ CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linux64Gcc44/c++ b/wmake/rules/linux64Gcc44/c++ index 677b1e5bb4..36b5c29b20 100644 --- a/wmake/rules/linux64Gcc44/c++ +++ b/wmake/rules/linux64Gcc44/c++ @@ -6,7 +6,7 @@ CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index 7a7a46d9a0..64d6797573 100644 --- a/wmake/rules/linuxGcc/c++ +++ b/wmake/rules/linuxGcc/c++ @@ -6,7 +6,7 @@ CC = g++ -m32 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linuxGcc42/c++ b/wmake/rules/linuxGcc42/c++ index 32d12ad9de..ab2410d3d0 100644 --- a/wmake/rules/linuxGcc42/c++ +++ b/wmake/rules/linuxGcc42/c++ @@ -6,7 +6,7 @@ CC = g++ -m32 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread diff --git a/wmake/rules/linuxGcc43/c++ b/wmake/rules/linuxGcc43/c++ index 7a7a46d9a0..64d6797573 100644 --- a/wmake/rules/linuxGcc43/c++ +++ b/wmake/rules/linuxGcc43/c++ @@ -6,7 +6,7 @@ CC = g++ -m32 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linuxGcc44/c++ b/wmake/rules/linuxGcc44/c++ index 7a7a46d9a0..64d6797573 100644 --- a/wmake/rules/linuxGcc44/c++ +++ b/wmake/rules/linuxGcc44/c++ @@ -6,7 +6,7 @@ CC = g++ -m32 include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++ index aae0bf9fe0..cfa9abbcab 100644 --- a/wmake/rules/linuxIA64Gcc/c++ +++ b/wmake/rules/linuxIA64Gcc/c++ @@ -6,7 +6,7 @@ CC = g++ include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-50 +ptFLAGS = -DNoRepository -ftemplate-depth-30 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++ index 534a3e0d7c..7590b089a3 100644 --- a/wmake/rules/linuxPPC64Gcc/c++ +++ b/wmake/rules/linuxPPC64Gcc/c++ @@ -6,7 +6,7 @@ CC = g++ -m64 -mcpu=power5+ include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC diff --git a/wmake/rules/linuxmingw32/c++ b/wmake/rules/linuxmingw32/c++ index 54a941adcd..0d1b9a38e0 100644 --- a/wmake/rules/linuxmingw32/c++ +++ b/wmake/rules/linuxmingw32/c++ @@ -6,7 +6,7 @@ CC = mingw32-g++ include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-60 +ptFLAGS = -DNoRepository -ftemplate-depth-40 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++ index 52d1823e2f..6b9154c0a7 100644 --- a/wmake/rules/solarisGcc/c++ +++ b/wmake/rules/solarisGcc/c++ @@ -6,7 +6,7 @@ CC = g++ include $(RULES)/c++$(WM_COMPILE_OPTION) -ptFLAGS = -DNoRepository -ftemplate-depth-50 +ptFLAGS = -DNoRepository -ftemplate-depth-30 c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC