From f7d35dd55a859b8b12e42f3f87c115b31a077be0 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 18 May 2002 00:55:14 +0000
Subject: [PATCH] Change lib names to avoid clashes on non case-sensitive
filesystems (e.g. on mac)
---
Adapt/Makefile | 6 +++---
Box/Makefile | 6 +++---
Common/Makefile | 6 +++---
DataStr/Makefile | 6 +++---
Fltk/Makefile | 6 +++---
Geo/Makefile | 6 +++---
Graphics/Makefile | 6 +++---
Makefile | 15 ++++++++-------
Mesh/Makefile | 6 +++---
Parallel/Makefile | 6 +++---
Parser/Makefile | 6 +++---
Plugin/Makefile | 6 +++---
Triangle/Makefile | 6 +++---
jpeg/Makefile | 6 +++---
14 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/Adapt/Makefile b/Adapt/Makefile
index 75062c45c1..798e5fd0b1 100644
--- a/Adapt/Makefile
+++ b/Adapt/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.24 2001-12-04 10:47:39 geuzaine Exp $
+# $Id: Makefile,v 1.25 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libAdapt.a"
+# Makefile for "libGmshAdapt.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libAdapt.a
+LIB = ../lib/libGmshAdapt.a
INCLUDE = -I../Common -I../DataStr
OPT_FLAGS = -g -Wall
diff --git a/Box/Makefile b/Box/Makefile
index 29bdc2d256..f9e6bcee61 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.14 2001-10-30 09:52:30 geuzaine Exp $
+# $Id: Makefile,v 1.15 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libBox.a"
+# Makefile for "libGmshBox.a"
#
.IGNORE:
@@ -9,7 +9,7 @@ CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libBox.a
+LIB = ../lib/libGmshBox.a
INCLUDE = -I../Common -I../DataStr -I../Geo\
-I../Graphics -I../Mesh -I../Parser -I../Fltk -I../Plugin -I../Parallel
diff --git a/Common/Makefile b/Common/Makefile
index d74e2c3018..99ea73b8e9 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.31 2002-02-22 16:43:41 geuzaine Exp $
+# $Id: Makefile,v 1.32 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libCommon.a"
+# Makefile for "libGmshCommon.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RANLIB = ranlib
RM = rm
-LIB = ../lib/libCommon.a
+LIB = ../lib/libGmshCommon.a
INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics\
-I../Mesh -I../Parser -I../Fltk
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 585d1542c5..04f7831620 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.13 2001-08-20 08:25:23 geuzaine Exp $
+# $Id: Makefile,v 1.14 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libDataStr.a"
+# Makefile for "libGmshDataStr.a"
#
.IGNORE:
@@ -9,7 +9,7 @@ CXX = c++
AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libDataStr.a
+LIB = ../lib/libGmshDataStr.a
INCLUDE = -I../Common
OPT_FLAGS = -g -Wall
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 51c1aab05f..6b1f4ee690 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.31 2002-01-03 10:25:06 geuzaine Exp $
+# $Id: Makefile,v 1.32 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libFltk.a"
+# Makefile for "libGmshFltk.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libFltk.a
+LIB = ../lib/libGmshFltk.a
INCLUDE = -I../Common -I../DataStr -I../Graphics -I../Geo\
-I../Mesh -I../Parser -I../Fltk -I../Plugin -I../utils
diff --git a/Geo/Makefile b/Geo/Makefile
index 6a66fa8e61..38f1096b04 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.28 2001-12-03 08:41:43 geuzaine Exp $
+# $Id: Makefile,v 1.29 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libGeo.a"
+# Makefile for "libGmshGeo.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RANLIB = ranlib
RM = rm
-LIB = ../lib/libGeo.a
+LIB = ../lib/libGmshGeo.a
INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Parser\
-I../Fltk
diff --git a/Graphics/Makefile b/Graphics/Makefile
index d37e9c4851..6d5fa8f030 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.35 2001-12-04 10:47:39 geuzaine Exp $
+# $Id: Makefile,v 1.36 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libGraphics.a"
+# Makefile for "libGmshGraphics.a"
#
.IGNORE:
@@ -9,7 +9,7 @@ CXX = c++
AR = ar ruvs
RANLIB = ranlib
RM = rm
-LIB = ../lib/libGraphics.a
+LIB = ../lib/libGmshGraphics.a
INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics\
-I../Fltk -I../Mesh -I../Parser -I../jpeg
diff --git a/Makefile b/Makefile
index ff72e01445..813f5bc1fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.209 2002-04-30 21:36:31 geuzaine Exp $
+# $Id: Makefile,v 1.210 2002-05-18 00:55:14 geuzaine Exp $
GMSH_MAJOR_VERSION = 1
GMSH_MINOR_VERSION = 35
@@ -26,10 +26,11 @@ GMSH_DEMO_DIR = demos
GMSH_TUTORIAL_DIR = tutorial
GMSH_ARCHIVE_DIR = archives
-GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo -lAdapt\
- -lPlugin -lCommon -lDataStr -lParallel -lTriangle
-GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lFltk -lParser -lGraphics -lMesh\
- -lGeo -lAdapt -lCommon -lDataStr -lJpeg -lPlugin -lParallel -lTriangle
+GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo -lGmshAdapt\
+ -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshParallel -lGmshTriangle
+GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh\
+ -lGmshGeo -lGmshAdapt -lGmshCommon -lGmshDataStr -lGmshJpeg -lGmshPlugin\
+ -lGmshParallel -lGmshTriangle
GMSH_RELEASE = $(GMSH_MAJOR_VERSION).$(GMSH_MINOR_VERSION).$(GMSH_PATCH_VERSION)
GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"`
@@ -634,10 +635,10 @@ compile-macosx: initialtag
"OS_FLAGS=" \
"VERSION_FLAGS=-D_FLTK -D_NODLL" \
"GL_INCLUDE=" \
- "GUI_INCLUDE=-I$(HOME)/Projects/fltk" \
+ "GUI_INCLUDE=-I../../fltk" \
); done
link-macosx:
- $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) -L../fltk/lib -lfltk_gl -lfltk_base \
+ $(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) -L../fltk/lib -lfltk_gl -lfltk \
-framework AGL -framework OpenGL -framework Carbon -framework ApplicationServices
/Developer/Tools/Rez -t APPL -o $(GMSH_BIN_DIR)/gmsh ../fltk/FL/mac.r
macosx: compile-macosx link-macosx
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 43942c591b..416c6d3b74 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.39 2001-12-16 05:16:37 remacle Exp $
+# $Id: Makefile,v 1.40 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libMesh.a"
+# Makefile for "libGmshMesh.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libMesh.a
+LIB = ../lib/libGmshMesh.a
INCLUDE = -I../Adapt -I../Common -I../DataStr -I../Geo -I../Mesh\
-I../Graphics -I../Parser -I../Fltk -I../Triangle
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 724ed33d79..1b62a4993a 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,13 +1,13 @@
-# $Id: Makefile,v 1.8 2002-04-13 04:01:09 geuzaine Exp $
+# $Id: Makefile,v 1.9 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libParallel.a"
+# Makefile for "libGmshParallel.a"
#
.IGNORE:
AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libParallel.a
+LIB = ../lib/libGmshParallel.a
CC = gcc
OPT_FLAGS = -g
diff --git a/Parser/Makefile b/Parser/Makefile
index 25d74155da..b95ddac75e 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.36 2002-02-22 16:43:41 geuzaine Exp $
+# $Id: Makefile,v 1.37 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libParser.a"
+# Makefile for "libGmshParser.a"
#
.IGNORE:
@@ -12,7 +12,7 @@ RM = rm
YACC = bison
LEX = flex
-LIB = ../lib/libParser.a
+LIB = ../lib/libGmshParser.a
INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics\
-I../Mesh -I../Fltk -I../Plugin -I../Parallel
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 62e42cf533..acf0991b7f 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.22 2001-11-05 11:25:11 geuzaine Exp $
+# $Id: Makefile,v 1.23 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libAdapt.a"
+# Makefile for "libGmshPlugin.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libPlugin.a
+LIB = ../lib/libGmshPlugin.a
INCLUDE = -I../Common -I../Graphics -I../DataStr -I../Geo -I../Mesh -I../Triangle
OPT_FLAGS = -g -Wall
diff --git a/Triangle/Makefile b/Triangle/Makefile
index 25d23f8800..1cf37ea5f1 100644
--- a/Triangle/Makefile
+++ b/Triangle/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.4 2001-10-31 16:33:46 remacle Exp $
+# $Id: Makefile,v 1.5 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libTriangle.a"
+# Makefile for "libGmshTriangle.a"
#
# If yours is not a Unix system, use the -DNO_TIMER switch to eliminate the
# Unix-specific timer code.
@@ -29,7 +29,7 @@ AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libTriangle.a
+LIB = ../lib/libGmshTriangle.a
RMFLAGS = -f
diff --git a/jpeg/Makefile b/jpeg/Makefile
index 41e35cafb4..dae1af57e0 100644
--- a/jpeg/Makefile
+++ b/jpeg/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.21 2001-08-20 08:25:24 geuzaine Exp $
+# $Id: Makefile,v 1.22 2002-05-18 00:55:14 geuzaine Exp $
#
-# Makefile for "libJpeg.a"
+# Makefile for "libGmshJpeg.a"
#
.IGNORE:
@@ -10,7 +10,7 @@ AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libJpeg.a
+LIB = ../lib/libGmshJpeg.a
INCLUDE = -I.
OPT_FLAGS = -g -Wall
--
GitLab