From e938bbb298d79be707d099de7790c7459476a7b2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 20 Aug 2001 15:02:43 +0000
Subject: [PATCH] CC -> CXX & CC
---
Makefile.Motif | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/Makefile.Motif b/Makefile.Motif
index bcba11e8af..ba0b271e02 100644
--- a/Makefile.Motif
+++ b/Makefile.Motif
@@ -1,9 +1,10 @@
-# $Id: Makefile.Motif,v 1.4 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile.Motif,v 1.5 2001-08-20 15:02:43 geuzaine Exp $
GMSH_RELEASE = 1.23
MAKE = make
-CC = c++
+CXX = c++
+CC = cc
FLAGS = -g -Wall
RM = rm
RMFLAGS = -f
@@ -64,6 +65,7 @@ GMSH_UNAME = `uname`
default: initialtag
@for i in $(GMSH_XMOTIF_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=$(FLAGS)" \
"OS_FLAGS=-D_LITTLE_ENDIAN -D_NOPLUGIN" \
@@ -73,15 +75,15 @@ default: initialtag
); done
gmsh:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_XMOTIF_LIB)\
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_XMOTIF_LIB)\
$(OPENGL_MOTIF_LIB) $(OPENGL_LIB) $(XMOTIF_LIB) $(THREAD_LIB) -lm
gmshm:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_XMOTIF_LIB)\
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_XMOTIF_LIB)\
$(MESA_MOTIF_LIB) $(MESA_LIB) $(XMOTIF_LIB) $(THREAD_LIB) -lm
static:
- $(CC) -o $(GMSH_BIN_DIR)/gmshm $(GMSH_XMOTIF_LIB)\
+ $(CXX) -o $(GMSH_BIN_DIR)/gmshm $(GMSH_XMOTIF_LIB)\
$(MESA_MOTIF_STATIC_LIB) $(MESA_STATIC_LIB)\
$(XMOTIF_LIB) $(THREAD_LIB) -lm
@@ -179,7 +181,8 @@ rpm: src
compile_little_endian:
@for i in $(GMSH_XMOTIF_DIR); do (cd $$i && $(MAKE) \
- "CC=g++" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_XMOTIF -D_NOPLUGIN" \
@@ -189,7 +192,8 @@ compile_little_endian:
compile_little_endian_2952:
@for i in $(GMSH_XMOTIF_DIR); do (cd $$i && $(MAKE) \
- "CC=$(HOME)/gcc-2.95.2/bin/g++" \
+ "CXX=$(HOME)/gcc-2.95.2/bin/g++" \
+ "CC=$(HOME)/gcc-2.95.2/bin/gcc" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_XMOTIF -D_NOPLUGIN" \
@@ -199,7 +203,8 @@ compile_little_endian_2952:
compile_little_endian_threads:
@for i in $(GMSH_XMOTIF_DIR); do (cd $$i && $(MAKE) \
- "CC=g++" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-D_REENTRANT -O3" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_XMOTIF -D_NOPLUGIN -D_USETHREADS" \
@@ -209,7 +214,8 @@ compile_little_endian_threads:
compile_big_endian:
@for i in $(GMSH_XMOTIF_DIR); do (cd $$i && $(MAKE) \
- "CC=g++" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=" \
"VERSION_FLAGS=-D_XMOTIF -D_NOPLUGIN" \
@@ -220,7 +226,8 @@ compile_big_endian:
# special car -O2 merde dans 3d_smesh.c sur TransfiniteHex()
compile_sgi:
@for i in $(GMSH_XMOTIF_DIR); do (cd $$i && $(MAKE) \
- "CC=CC" \
+ "CXX=CC" \
+ "CC=cc" \
"OPT_FLAGS=-O2 -o32 -Olimit 3000" \
"RANLIB=true"\
"AR=CC -o32 -ar -o"\
@@ -230,7 +237,8 @@ compile_sgi:
"GUI_INCLUDE=$(MOTIF_INC)" \
); done
@for i in Mesh; do (cd $$i && $(MAKE) \
- "CC=CC" \
+ "CXX=CC" \
+ "CC=cc" \
"OPT_FLAGS=-O1 -o32" \
"AR=CC -o32 -ar -o"\
"RANLIB=true"\
--
GitLab