Restore symmetry between CXXFLAGS and the other compilation flags, now

they contain all also the optimisation level.

diff --git a/conf/GeneralDef b/conf/GeneralDef
index d59fadc75fe5610561d09429b658815fdf196e38..5560dae9b1f3744b848eafb0d598cc88c59d0012 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -3,7 +3,7 @@
 .SUFFIXES: .cxx
  
 .cxx.o:
-       @$(CXX) $(OPT) $(CXXFLAGS) -c $*.cxx -o $*.o
+       @$(CXX) $(CXXFLAGS) -c $*.cxx -o $*.o
 .c.o:
        @$(CC) $(CFLAGS) -c $*.c -o $*.o
 .f.o:

diff --git a/conf/MachineDef.HP-UX b/conf/MachineDef.HP-UX
index b73d8e5f6e68cd0e1947a0c4201616809b604e6d..e758aafb2cff108a6025e1cb2c8d30c463cf66bb 100644 (file)
--- a/conf/MachineDef.HP-UX
+++ b/conf/MachineDef.HP-UX
@@ -7,13 +7,12 @@ F77         = f77
 
 # Global optimisation
 OPT          = -O +Onolimit
-OPT           = -g
 
 # Shared library suffix
 SL           = sl
 
 # The options
-CXXOPTS       = +a1 +z  
+CXXOPTS       = $(OPT) +a1 +z  
 COPT          = $(OPT)
 FOPT          = $(OPT) +ppu +Z
 

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index c32dcce113e5c227e9495c2b624925f72bbb7af3..1e60b54b85ab5dc160a9f4cd73f127b1049617f5 100644 (file)
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -7,13 +7,13 @@ F77         = echo $*.F ; g77
 CC           = echo $*.c ; gcc
 
 # Global optimisation
-OPT           = -g
+OPT           = -O2
 
 # Shared library suffix
 SL           = so
 
 # The options
-CXXOPTS       = -Wall -fPIC  -fno-rtti -fno-exceptions
+CXXOPTS       = $(OPT) -Wall -fPIC  -fno-rtti -fno-exceptions
 COPT         = $(OPT)
 FOPT         = $(OPT) -fno-second-underscore
 

diff --git a/conf/MachineDef.OSF1 b/conf/MachineDef.OSF1
index b3d013e4700ef1e167305dec23d20d39d55d0646..d58aa37a478f42fd4e35241c37355e52b576b00f 100644 (file)
--- a/conf/MachineDef.OSF1
+++ b/conf/MachineDef.OSF1
@@ -7,13 +7,12 @@ F77         = f77
 
 # Global optimisation
 OPT          = -O
-OPT           = -g
 
 # Shared library suffix
 SL           = so
 
 # The options
-CXXOPTS       = -I/usr/include
+CXXOPTS       = $(OPT) -I/usr/include
 COPT          = $(OPT)
 FOPT          = $(OPT) -nofor_main
 

diff --git a/conf/MachineDef.SunOS b/conf/MachineDef.SunOS
index 964799764bcde5fd3921595c72e51857740a734d..bdb58f6d04b0e0f371a7183bd23b6d368fc4947f 100644 (file)
--- a/conf/MachineDef.SunOS
+++ b/conf/MachineDef.SunOS
@@ -8,13 +8,12 @@ F77         = f77
 
 # Global optimisation
 OPT           = -O
-OPT           = -g
 
 # Shared library suffix
 SL           = so
 
 # The options
-CXXOPTS       = +w -KPIC
+CXXOPTS       = $(OPT) +w -KPIC
 COPT         = $(OPT) -KPIC -erroff=%none
 FOPT         = $(OPT) -KPIC