Align the different Darwin architectures. Add stub-file about untested

--HG--
branch : macMerge
rename : wmake/rules/darwinIntel64/X => wmake/rules/darwinIntel/X
rename : wmake/rules/darwinIntel64/c => wmake/rules/darwinIntel/c
rename : wmake/rules/darwinIntel64/c++ => wmake/rules/darwinIntel/c++
rename : wmake/rules/darwinIntel64/c++Debug => wmake/rules/darwinIntel/c++Debug
rename : wmake/rules/darwinIntel64/c++Opt => wmake/rules/darwinIntel/c++Opt
rename : wmake/rules/darwinIntel64/c++Prof => wmake/rules/darwinIntel/c++Prof
rename : wmake/rules/darwinIntel64/cDebug => wmake/rules/darwinIntel/cDebug
rename : wmake/rules/darwinIntel64/cOpt => wmake/rules/darwinIntel/cOpt
rename : wmake/rules/darwinIntel64/cProf => wmake/rules/darwinIntel/cProf
rename : wmake/rules/darwinIntel64/general => wmake/rules/darwinIntel/general
rename : wmake/rules/darwinIntel64/mplib => wmake/rules/darwinIntel/mplib
rename : wmake/rules/darwinIntel64/mplibOPENMPI => wmake/rules/darwinIntel/mplibOPENMPI
rename : wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI => wmake/rules/darwinIntel/mplibSYSTEMOPENMPI

etc/bashrc

@@ -221,8 +221,8 @@ Darwin)
 	export WM_ARCH=darwinIntel
 	;;
     *)
-        echo "This seems to be an Intel-Mac please tell me the output of 'uname -p'. Bernhard."
+        echo "This seems to be neither an Intel-Mac nor a PPC-Mac please tell me the output of 'uname -p'. Bernhard."
-	export WM_ARCH=darwinIntel
+	export WM_ARCH=darwinUnknown
 	;;
     esac
     case $WM_ARCH_OPTION in

wmake/rules/darwinIntel/c

@@ -2,8 +2,7 @@
 
 cWARN        = -Wall
 
-# cc          = gcc 
+cc          = gcc $(WM_CXXFLAGS)
-cc          = gcc-4.2 
 
 include $(RULES)/c$(WM_COMPILE_OPTION)
 

wmake/rules/darwinIntel/c++

@@ -2,8 +2,7 @@
 
 c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
 
-# CC          = g++
+CC          = g++ $(WM_CXXFLAGS)
-CC          = g++-4.2
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
@@ -19,4 +18,5 @@ cpptoo      = $(Ctoo)
 LINK_LIBS   = $(c++DBUG) -lpthread
 
 LINKLIBSO   = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
-LINKEXE     = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lOpenFOAM -L$(FOAM_MPI_LIBBIN) -lPstream
+# LINKEXE     = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lOpenFOAM -L$(FOAM_MPI_LIBBIN) -lPstream
+LINKEXE     = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream

wmake/rules/darwinIntel/c++Debug

@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG    = -ggdb2 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline

wmake/rules/darwinIntel/c++Opt

@@ -0,0 +1,4 @@
+c++DBUG     = 
+c++OPT      = -O3
+#c++OPT      = -march=nocona -O3
+# -ftree-vectorize -ftree-vectorizer-verbose=3

wmake/rules/darwinIntel/general

@@ -1,4 +1,4 @@
-CPP        = cpp-4.2 $(WM_CPP_OPTIONS)
+CPP        = cpp $(GFLAGS)
 LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT)

wmake/rules/darwinIntel/mplibSYSTEMOPENMPI

@@ -0,0 +1 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX

wmake/rules/darwinIntel64/ARCHITECTURE_TESTED

@@ -0,0 +1 @@
+by bgschaid. 2010-10-05

wmake/rules/darwinIntel64/c

@@ -2,7 +2,6 @@
 
 cWARN        = -Wall
 
-# cc          = gcc-mp-4.3 -m64
 cc          = gcc $(WM_CXXFLAGS)
 
 include $(RULES)/c$(WM_COMPILE_OPTION)

wmake/rules/darwinIntel64/c++

@@ -2,7 +2,6 @@
 
 c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
 
-# CC          = g++-mp-4.3 -m64
 CC          = g++ $(WM_CXXFLAGS)
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/darwinIntel64/general

@@ -1,4 +1,4 @@
-CPP        = cpp-mp-4.3 $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT)

wmake/rules/darwinIntelGcc/c++Opt

@@ -1,3 +0,0 @@
-c++DBUG     = 
-c++OPT      = -O3
-# c++OPT      = -O3 -ffast-math -fsignaling-nans

wmake/rules/darwinPpc/c

@@ -2,7 +2,7 @@
 
 cWARN        = -Wall
 
-cc          = gcc 
+cc          = gcc $(WM_CXXFLAGS)
 
 include $(RULES)/c$(WM_COMPILE_OPTION)
 

wmake/rules/darwinPpc/c++

@@ -2,7 +2,7 @@
 
 c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
 
-CC          = g++
+CC          = g++ $(WM_CXXFLAGS)
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
@@ -18,4 +18,5 @@ cpptoo      = $(Ctoo)
 LINK_LIBS   = $(c++DBUG) -lpthread
 
 LINKLIBSO   = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
-LINKEXE     = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lOpenFOAM -L$(FOAM_MPI_LIBBIN) -lPstream
+# LINKEXE     = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lOpenFOAM -L$(FOAM_MPI_LIBBIN) -lPstream
+LINKEXE     = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream

wmake/rules/darwinPpc/general

@@ -1,4 +1,4 @@
-CPP        = cpp $(WM_CPP_OPTIONS)
+CPP        = cpp $(GFLAGS)
 LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT)
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
-include $(GENERAL_RULES)/cint