From 801daf2e74b0c3c8a4cac3207b7055ef23d63a1e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 23 Apr 2008 23:00:41 +0000
Subject: [PATCH] sh**t that does not work on mac ->try #2

---
 Box/Makefile              | 6 +++---
 Common/Makefile           | 6 +++---
 DataStr/Makefile          | 6 +++---
 Geo/Makefile              | 6 +++---
 Makefile                  | 8 +++++---
 Mesh/Makefile             | 6 +++---
 Numeric/Makefile          | 7 ++++---
 Parallel/Makefile         | 6 +++---
 Parser/Makefile           | 6 +++---
 Plugin/Makefile           | 6 +++---
 Post/Makefile             | 6 +++---
 contrib/ANN/Makefile      | 6 +++---
 contrib/MathEval/Makefile | 6 +++---
 contrib/NR/Makefile       | 6 +++---
 contrib/Netgen/Makefile   | 6 +++---
 contrib/Tetgen/Makefile   | 6 +++---
 doc/gmsh.html             | 2 +-
 17 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/Box/Makefile b/Box/Makefile
index f8dcea8f29..a4e7833609 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.49 2008-04-23 22:38:42 geuzaine Exp $
+# $Id: Makefile,v 1.50 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -40,8 +40,8 @@ ${LIB}: ${OBJ} Main${OBJEXT}
 	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Common/Makefile b/Common/Makefile
index 440af91a31..45ebd517d3 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.169 2008-04-23 22:38:46 geuzaine Exp $
+# $Id: Makefile,v 1.170 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -51,8 +51,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/DataStr/Makefile b/DataStr/Makefile
index baa1a50ea0..c0e6a51532 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.46 2008-04-23 22:38:47 geuzaine Exp $
+# $Id: Makefile,v 1.47 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -42,8 +42,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Geo/Makefile b/Geo/Makefile
index 4c93d6675c..3ab63da00a 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.203 2008-04-23 22:38:48 geuzaine Exp $
+# $Id: Makefile,v 1.204 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -63,8 +63,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Makefile b/Makefile
index c58ee2861a..96b50bcb66 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.479 2008-04-23 22:38:36 geuzaine Exp $
+# $Id: Makefile,v 1.480 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -82,9 +82,11 @@ uninstall-mac:
 	rm -rf /Applications/Gmsh.app
 
 .PHONY: lib
-lib:
-	@for i in ${GMSH_DIRS}; do (cd $$i && ${MAKE} lib); done
+lib: variables initialtag
+	@for i in ${GMSH_DIRS}; do (cd $$i && ${MAKE} cpobj); done
+	${AR} ${ARFLAGS}lib/libGmsh${LIBEXT} lib/*${OBJEXT}
 	${RANLIB} lib/libGmsh${LIBEXT}
+	rm -f lib/*${OBJEXT}
 
 install-lib: lib
 	mkdir -p ${includedir}/gmsh
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 6763480e67..ecd8680120 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.215 2008-04-23 22:38:50 geuzaine Exp $
+# $Id: Makefile,v 1.216 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -65,8 +65,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Numeric/Makefile b/Numeric/Makefile
index 5c7f413a00..e850cd24ee 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.50 2008-04-23 22:38:51 geuzaine Exp $
+# $Id: Makefile,v 1.51 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -44,8 +44,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
@@ -68,6 +68,7 @@ NumericEmbedded.o: NumericEmbedded.cpp NumericEmbedded.h \
 EigSolve.o: EigSolve.cpp
 FunctionSpace.o: FunctionSpace.cpp FunctionSpace.h ../Common/GmshMatrix.h \
   ../Common/GmshDefines.h
+gmsh_predicates.o: gmsh_predicates.cpp
 gsl_newt.o: gsl_newt.cpp ../Common/Message.h Numeric.h NumericEmbedded.h
 gsl_min.o: gsl_min.cpp ../Common/Message.h Numeric.h NumericEmbedded.h
 gsl_brent.o: gsl_brent.cpp ../Common/Message.h Numeric.h \
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 4cb603dee9..3a772b10e5 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.44 2008-04-23 22:38:52 geuzaine Exp $
+# $Id: Makefile,v 1.45 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -37,8 +37,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Parser/Makefile b/Parser/Makefile
index 8cb368a8e8..28c06a6323 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.150 2008-04-23 22:38:53 geuzaine Exp $
+# $Id: Makefile,v 1.151 2008-04-23 23:00:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -43,8 +43,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Plugin/Makefile b/Plugin/Makefile
index afae2046ed..6dbd96e955 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.163 2008-04-23 22:38:54 geuzaine Exp $
+# $Id: Makefile,v 1.164 2008-04-23 23:00:40 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -58,8 +58,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/Post/Makefile b/Post/Makefile
index b1bf860c1b..4eb8779294 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.42 2008-04-23 22:38:55 geuzaine Exp $
+# $Id: Makefile,v 1.43 2008-04-23 23:00:40 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -47,8 +47,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/contrib/ANN/Makefile b/contrib/ANN/Makefile
index a6993f9f15..e7c2dd52e0 100644
--- a/contrib/ANN/Makefile
+++ b/contrib/ANN/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2008-04-23 22:38:56 geuzaine Exp $
+# $Id: Makefile,v 1.23 2008-04-23 23:00:40 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -50,8 +50,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $< ${DASH}o ${<:.cpp=${OBJEXT}}
diff --git a/contrib/MathEval/Makefile b/contrib/MathEval/Makefile
index 2ac0bfd6a1..8d18d35559 100644
--- a/contrib/MathEval/Makefile
+++ b/contrib/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2008-04-23 22:38:57 geuzaine Exp $
+# $Id: Makefile,v 1.23 2008-04-23 23:00:40 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -42,8 +42,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/contrib/NR/Makefile b/contrib/NR/Makefile
index ce212df514..df1a11f584 100644
--- a/contrib/NR/Makefile
+++ b/contrib/NR/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 2008-04-23 22:38:58 geuzaine Exp $
+# $Id: Makefile,v 1.13 2008-04-23 23:00:40 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -48,8 +48,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/contrib/Netgen/Makefile b/contrib/Netgen/Makefile
index ef78406ddb..ae20a9bbd6 100644
--- a/contrib/Netgen/Makefile
+++ b/contrib/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.37 2008-04-23 22:38:59 geuzaine Exp $
+# $Id: Makefile,v 1.38 2008-04-23 23:00:40 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -136,8 +136,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../../lib/
 
 .cpp${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $< ${DASH}o ${<:.cpp=${OBJEXT}}
diff --git a/contrib/Tetgen/Makefile b/contrib/Tetgen/Makefile
index 38b3f6ec83..69ddcd3b2f 100644
--- a/contrib/Tetgen/Makefile
+++ b/contrib/Tetgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 2008-04-23 22:39:00 geuzaine Exp $
+# $Id: Makefile,v 1.13 2008-04-23 23:00:41 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -35,8 +35,8 @@ ${LIB}: ${OBJ}
 	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-lib: ${OBJ} 
-	${AR} ${ARFLAGS}../../lib/libGmsh${LIBEXT} ${OBJ}
+cpobj: ${OBJ} 
+	cp -f ${OBJ} ../../lib/
 
 .cxx${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c $<
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 51ecfbe424..9374d075a6 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -40,7 +40,7 @@ generator with built-in pre- and post-processing facilities</h1>
 
 <h2><a name="Description"></a>Description</h2>
 
-Gmsh is an automatic 3D finite element grid generator with a build-in
+Gmsh is an automatic 3D finite element grid generator with a built-in
 CAD engine and post-processor. Its design goal is to provide a simple
 meshing tool for academic problems with parametric input and advanced
 visualization capabilities.
-- 
GitLab