From fdeb80798ee62ca8b3e978f850e1cbc394699518 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 20 Aug 2001 08:25:24 +0000
Subject: [PATCH] CC -> CXX & CC
---
Adapt/Makefile | 8 +++---
Box/Makefile | 8 +++---
Common/Makefile | 8 +++---
DataStr/Makefile | 8 +++---
Fltk/Makefile | 8 +++---
Geo/Makefile | 8 +++---
Graphics/Makefile | 8 +++---
Makefile | 70 +++++++++++++++++++++++++++++++----------------
Mesh/Makefile | 8 +++---
Motif/Makefile | 8 +++---
Parallel/Makefile | 6 ++--
Parser/Makefile | 8 +++---
Plugin/Makefile | 8 +++---
Triangle/Makefile | 10 +++----
jpeg/Makefile | 12 ++++----
utils/Makefile | 6 ++--
16 files changed, 107 insertions(+), 85 deletions(-)
diff --git a/Adapt/Makefile b/Adapt/Makefile
index 18ffd43e0b..86a4f25fcb 100644
--- a/Adapt/Makefile
+++ b/Adapt/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.22 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.23 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libAdapt.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -41,7 +41,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -51,7 +51,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Box/Makefile b/Box/Makefile
index 8f923c63f1..6a5828879b 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.11 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.12 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libBox.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -31,7 +31,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -41,7 +41,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Common/Makefile b/Common/Makefile
index 5bdd0577da..968e95f58f 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.27 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.28 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libCommon.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RANLIB = ranlib
RM = rm
@@ -44,7 +44,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -57,7 +57,7 @@ res:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/DataStr/Makefile b/DataStr/Makefile
index a3bcefd4aa..585d1542c5 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.12 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.13 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libDataStr.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -34,7 +34,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -44,7 +44,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Fltk/Makefile b/Fltk/Makefile
index c047cfa89c..6220af4c9d 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.26 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.27 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libFltk.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -46,7 +46,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -56,7 +56,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Geo/Makefile b/Geo/Makefile
index 360ba8bc3d..69fc132223 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.24 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.25 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libGeo.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RANLIB = ranlib
RM = rm
@@ -40,7 +40,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -50,7 +50,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 3358d4ce9f..dd022b574d 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.30 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.31 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libGraphics.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RANLIB = ranlib
RM = rm
@@ -52,7 +52,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -62,7 +62,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Makefile b/Makefile
index b8e8686f27..595db2ad36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
-# $Id: Makefile,v 1.138 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.139 2001-08-20 08:25:23 geuzaine Exp $
GMSH_RELEASE = 1.24
MAKE = make
-CC = c++
+CXX = c++
+CC = cc
FLAGS = -g -Wall
RM = rm
RMFLAGS = -f
@@ -46,6 +47,7 @@ GMSH_SOURCES = `find . \( ! -name "*.tar*" -a ! -name "*.tgz" \
default: initialtag
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=$(FLAGS)" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
@@ -55,11 +57,12 @@ default: initialtag
); done
gmsh:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -L/usr/X11R6/lib $(X11_LIB) -lm
static:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
@@ -67,7 +70,7 @@ static:
"GL_INCLUDE=-I$(HOME)/SOURCES/Mesa-static/include" \
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done
- $(CC) -o $(GMSH_BIN_DIR)/gmshm $(GMSH_FLTK_LIB)\
+ $(CXX) -o $(GMSH_BIN_DIR)/gmshm $(GMSH_FLTK_LIB)\
$(HOME)/SOURCES/Mesa-static/lib/libGLU.a\
$(HOME)/SOURCES/Mesa-static/lib/libGL.a\
$(HOME)/SOURCES/fltk-static/lib/libfltk.a -lX11 -lm
@@ -78,7 +81,7 @@ purify:
-L/usr/X11R6/lib -lX11 -lm -ldl -lsocket
efence:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -L/usr/X11R6/lib $(X11_LIB) -lefence -lm
# ----------------------------------------------------------------------
@@ -105,6 +108,7 @@ clean:
depend:
for i in $(GMSH_DIR); \
do (cd $$i && $(MAKE) depend \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"VERSION_FLAGS=-D_FLTK" \
"GL_INCLUDE=" \
@@ -188,6 +192,7 @@ dem:
bb: tag
@for i in $(GMSH_BOX_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=" \
@@ -195,12 +200,13 @@ bb: tag
"GL_INCLUDE=" \
"GUI_INCLUDE=" \
); done
- $(CC) -o $(GMSH_BIN_DIR)/gmsh-bb $(GMSH_BOX_LIB) -lm
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh-bb $(GMSH_BOX_LIB) -lm
bb-parallel: tag
PARALLEL=1
@for i in $(GMSH_BOX_DIR); do (cd $$i && $(MAKE) \
- "CC=mpiCC" \
+ "CXX=mpiCC" \
+ "CC=$(CC)" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=" \
"VERSION_FLAGS=-D_BLACKBOX -DPARALLEL" \
@@ -211,9 +217,10 @@ bb-parallel: tag
bb-mingw: tag
@for i in $(GMSH_BOX_DIR) ; do (cd $$i && $(MAKE) \
- "CC=g++ -mno-cygwin -I/mingw/include" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O3" \
- "OS_FLAGS=" \
+ "OS_FLAGS=-mno-cygwin -I/mingw/include" \
"VERSION_FLAGS=-D_BLACKBOX" \
"GL_INCLUDE=" \
"GUI_INCLUDE=" \
@@ -229,6 +236,7 @@ bb-mingw: tag
#
compile_linux:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-g -O2 -Wall" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
@@ -237,7 +245,7 @@ compile_linux:
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done
link_linux:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -L/usr/X11R6/lib $(X11_LIB) -lm -ldl
linux: tag compile_linux link_linux strip_bin
@@ -246,6 +254,7 @@ linux: tag compile_linux link_linux strip_bin
#
compile_fltk2:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-g -Wall" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
@@ -254,7 +263,7 @@ compile_fltk2:
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk-2.0" \
); done
link_fltk2:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB)\
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB)\
$(HOME)/SOURCES/fltk-2.0/lib/libfltk_gl.so.2\
$(OPENGL_LIB) \
$(HOME)/SOURCES/fltk-2.0/lib/libfltk_forms.so.2 \
@@ -267,7 +276,8 @@ fltk2: compile_fltk2 link_fltk2
#
compile_linux_gcc-2.95:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=$(HOME)/gcc-2.95.3/bin/g++" \
+ "CXX=$(HOME)/gcc-2.95.3/bin/g++" \
+ "CC=$(HOME)/gcc-2.95.3/bin/gcc" \
"OPT_FLAGS=-O2" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
@@ -276,7 +286,8 @@ compile_linux_gcc-2.95:
); done
rm -f Mesh/3D_Extrude.o
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=$(HOME)/gcc-2.95.3/bin/g++" \
+ "CXX=$(HOME)/gcc-2.95.3/bin/g++" \
+ "CC=$(HOME)/gcc-2.95.3/bin/gcc" \
"OPT_FLAGS=-O0" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
@@ -298,6 +309,7 @@ rpm: src
#
compile_linux_scorec :
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O2" \
"VERSION_FLAGS=-D_FLTK" \
@@ -306,7 +318,7 @@ compile_linux_scorec :
"GUI_INCLUDE=-I/users/develop/develop/visual/fltk/1.0/include" \
); done
link_linux_scorec:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh-linux $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh-linux $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
/users/develop/develop/visual/fltk/1.0/lib/x86_linux/libfltk.a\
-L/usr/X11R6/lib -lX11 -lm -ldl
linux_scorec : compile_linux_scorec link_linux_scorec strip_bin
@@ -316,6 +328,7 @@ linux_scorec : compile_linux_scorec link_linux_scorec strip_bin
#
compile_dec:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O2" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
@@ -324,7 +337,7 @@ compile_dec:
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done
link_dec:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) $(X11_LIB) -lm
dec: tag compile_dec link_dec strip_bin
@@ -333,6 +346,7 @@ dec: tag compile_dec link_dec strip_bin
#
compile_hp:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=" \
@@ -351,6 +365,7 @@ hp: tag compile_hp link_hp strip_bin
#
compile_ibm:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=-D_BSD" \
@@ -359,7 +374,7 @@ compile_ibm:
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done
link_ibm:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) $(X11_LIB) -lm
ibm: tag compile_ibm link_ibm strip_bin
@@ -368,7 +383,8 @@ ibm: tag compile_ibm link_ibm strip_bin
#
compile_sgi:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=CC" \
+ "CXX=CC" \
+ "CC=cc" \
"OPT_FLAGS=-O2 -OPT:Olimit=0 -LANG:std" \
"RANLIB=true"\
"AR=CC -mips3 -n32 -ar -o"\
@@ -387,9 +403,10 @@ sgi: tag compile_sgi link_sgi strip_bin
#
compile_mingw:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=g++ -mno-cygwin -I/mingw/include" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O2" \
- "OS_FLAGS= -DWIN32 -D_LITTLE_ENDIAN" \
+ "OS_FLAGS=-DWIN32 -D_LITTLE_ENDIAN -mno-cygwin -I/mingw/include" \
"VERSION_FLAGS=-D_FLTK" \
"GL_INCLUDE=" \
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
@@ -406,7 +423,8 @@ mingw: tag compile_mingw link_mingw
#
compile_cygwin:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=g++" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O2" \
"OS_FLAGS=-DWIN32 -D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK -I/usr/include/w32api" \
@@ -425,7 +443,8 @@ cygwin: tag compile_cygwin link_cygwin
#
cygwin_gertha_buro: tag
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=g++" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O2" \
"OS_FLAGS=-DWIN32 -D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
@@ -441,7 +460,8 @@ cygwin_gertha_buro: tag
#
cygwin_laptopjf:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
- "CC=g++" \
+ "CXX=g++" \
+ "CC=gcc" \
"OPT_FLAGS=-O2" \
"OS_FLAGS=-DWIN32 -D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
@@ -458,6 +478,7 @@ cygwin_laptopjf_tag: tag cygwin_laptopjf
#
compile_sun:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O3" \
"OS_FLAGS=" \
@@ -466,7 +487,7 @@ compile_sun:
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done
link_sun:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB)\
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB)\
-L$(HOME)/SOURCES/Mesa-3.1/lib $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB)\
$(X11_LIB) -lXext -lsocket -lnsl -ldl -lm
@@ -477,6 +498,7 @@ sun: tag compile_sun link_sun strip_bin
#
compile_solaris_scorec :
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
+ "CXX=$(CXX)" \
"CC=$(CC)" \
"OPT_FLAGS=-O3" \
"VERSION_FLAGS=-D_FLTK" \
@@ -485,7 +507,7 @@ compile_solaris_scorec :
"GUI_INCLUDE=-I/users/develop/develop/visual/fltk/1.0/include" \
); done
link_solaris_scorec:
- $(CC) -o $(GMSH_BIN_DIR)/gmsh-sun $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh-sun $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
/users/develop/develop/visual/fltk/1.0/lib/sun4_5/libfltk-gcc.a\
-L/usr/X11R6/lib -lX11 -lm -ldl -lsocket
solaris_scorec : compile_solaris_scorec link_solaris_scorec strip_bin
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 841ee629d0..77ad68a23c 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.30 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.31 2001-08-20 08:25:23 geuzaine Exp $
#
# Makefile for "libMesh.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -74,7 +74,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -84,7 +84,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Motif/Makefile b/Motif/Makefile
index acc6b13130..6bcf9ad661 100644
--- a/Motif/Makefile
+++ b/Motif/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.20 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.21 2001-08-20 08:25:24 geuzaine Exp $
#
# Makefile for "libMotif.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -54,7 +54,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -64,7 +64,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 29b3239488..04c4fa5973 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.5 2001-08-20 08:25:24 geuzaine Exp $
#
# Makefile for "libParallel.a"
#
@@ -28,7 +28,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -38,7 +38,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Parser/Makefile b/Parser/Makefile
index 2fd02fc531..cc58720cc3 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.30 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.31 2001-08-20 08:25:24 geuzaine Exp $
#
# Makefile for "libParser.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RANLIB = ranlib
RM = rm
@@ -42,7 +42,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
parser:
$(YACC) --output Gmsh.tab.cpp -d Gmsh.y
@@ -56,7 +56,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 541002e1cc..655ad4da8e 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.17 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.18 2001-08-20 08:25:24 geuzaine Exp $
#
# Makefile for "libAdapt.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -36,7 +36,7 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.cpp.o:
- $(CC) $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -46,7 +46,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/Triangle/Makefile b/Triangle/Makefile
index 03ed93722f..f583d2cbbc 100644
--- a/Triangle/Makefile
+++ b/Triangle/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.3 2001-08-20 08:25:24 geuzaine Exp $
#
# Makefile for "libTriangle.a"
#
@@ -24,7 +24,7 @@
.IGNORE:
-FORCE_CC = cc
+CC = cc
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -34,7 +34,7 @@ LIB = ../lib/libTriangle.a
RMFLAGS = -f
# Do not optimize Triangle: it fucks up on Linux
-CFLAGS = $(OS_FLAGS) -O0 -DTRILIBRARY
+CFLAGS = -O0 $(OS_FLAGS) -DTRILIBRARY
SRC = triangle.c
@@ -47,14 +47,14 @@ $(LIB): $(OBJ)
$(RANLIB) $(LIB)
.c.o:
- $(FORCE_CC) $(CFLAGS) -c $<
+ $(CC) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o triangle showme tricall *.?.poly *.?.node *.?.ele
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(FORCE_CC) -MM $(CFLAGS) ${SRC} \
+ $(CC) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/jpeg/Makefile b/jpeg/Makefile
index f464291118..41e35cafb4 100644
--- a/jpeg/Makefile
+++ b/jpeg/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.20 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.21 2001-08-20 08:25:24 geuzaine Exp $
#
# Makefile for "libJpeg.a"
#
.IGNORE:
-CC = c++
+CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
@@ -27,14 +27,14 @@ SRC = jcomapi.c jutils.c jerror.c jmemmgr.c jmemnobs.c \
OBJ = $(SRC:.c=.o)
-.SUFFIXES: .o .cpp
+.SUFFIXES: .o .c
$(LIB): $(OBJ)
$(AR) $(LIB) $(OBJ)
$(RANLIB) $(LIB)
-.cpp.o:
- $(CC) $(CFLAGS) -c $<
+.c.o:
+ $(CXX) $(CFLAGS) -c $<
clean:
$(RM) $(RMFLAGS) *.o
@@ -44,7 +44,7 @@ lint:
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
- $(CC) -MM $(CFLAGS) ${SRC} \
+ $(CXX) -MM $(CFLAGS) ${SRC} \
) >Makefile.new
cp Makefile Makefile.bak
cp Makefile.new Makefile
diff --git a/utils/Makefile b/utils/Makefile
index 373d7d5f46..fda4acbffb 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,13 +1,13 @@
-# $Id: Makefile,v 1.4 2001-08-20 08:03:00 geuzaine Exp $
+# $Id: Makefile,v 1.5 2001-08-20 08:25:24 geuzaine Exp $
-CC = c++
+CXX = c++
OPT_FLAGS = -g
RM = rm
RMFLAGS = -f
dxf2geo: dxf2geo.c message.c
- $(CC) $(OPT_FLAGS) -o ../bin/dxf2geo -I../DataStr\
+ $(CXX) $(OPT_FLAGS) -o ../bin/dxf2geo -I../DataStr\
dxf2geo.c message.c ../lib/libDataStr.a -lm
clean:
--
GitLab