From a4a43406048369cb5fbfcb25fe7724f8d83c28fe Mon Sep 17 00:00:00 2001
From: fca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 11 Jun 1999 18:57:33 +0000
Subject: [PATCH] Restore symmetry between CXXFLAGS and the other compilation
 flags, now they contain all also the optimisation level.

---
 conf/GeneralDef       | 2 +-
 conf/MachineDef.HP-UX | 3 +--
 conf/MachineDef.Linux | 4 ++--
 conf/MachineDef.OSF1  | 3 +--
 conf/MachineDef.SunOS | 3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/conf/GeneralDef b/conf/GeneralDef
index d59fadc75fe..5560dae9b1f 100644
--- 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 b73d8e5f6e6..e758aafb2cf 100644
--- 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 c32dcce113e..1e60b54b85a 100644
--- 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 b3d013e4700..d58aa37a478 100644
--- 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 964799764bc..bdb58f6d04b 100644
--- 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
 
-- 
2.39.3