Skip to content
Snippets Groups Projects
Commit 48a9c230 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

typos

parent 3c99b18e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 16
− 13
View file @ 48a9c230
# $Id: Makefile,v 1.130 2001-08-14 16:10:47 geuzaine Exp $ # $Id: Makefile,v 1.131 2001-08-15 10:03:33 geuzaine Exp $
GMSH_RELEASE = 1.23 GMSH_RELEASE = 1.23
MAKE = make MAKE = make
CC = c++ CC = c++
FLAGS = -g -Wall FLAGS = -g -Wall
...@@ -14,29 +15,30 @@ X11_LIB = -lX11 ...@@ -14,29 +15,30 @@ X11_LIB = -lX11
# Gmsh definitions # Gmsh definitions
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
GMSH_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Motif Fltk\ GMSH_COMMON_DIR = Adapt Common DataStr Geo Mesh Parallel Parser Plugin
Plugin jpeg utils Parallel GMSH_BOX_DIR =$(GMSH_COMMON_DIR) Box
GMSH_FLTK_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Fltk\ GMSH_FLTK_DIR = $(GMSH_COMMON_DIR) Graphics Fltk jpeg
jpeg Plugin Parallel GMSH_DIR = $(GMSH_COMMON_DIR) Box Graphics Motif Fltk jpeg utils
GMSH_BOX_DIR = Adapt Box Common DataStr Geo Mesh Parser Plugin Parallel
GMSH_BIN_DIR = bin GMSH_BIN_DIR = bin
GMSH_LIB_DIR = lib GMSH_LIB_DIR = lib
GMSH_DOC_DIR = doc GMSH_DOC_DIR = doc
GMSH_DEMO_DIR = demos GMSH_DEMO_DIR = demos
GMSH_TUTOR_DIR = tutorial GMSH_TUTORIAL_DIR = tutorial
GMSH_ARCHIVE_DIR = archives GMSH_ARCHIVE_DIR = archives
GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lFltk -lParser -lGraphics -lMesh\
-lGeo -lAdapt -lCommon -lDataStr -lJpeg -lPlugin -lParallel
GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo -lAdapt\ GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo -lAdapt\
-lPlugin -lCommon -lDataStr -lParallel -lPlugin -lCommon -lDataStr -lParallel
GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lFltk -lParser -lGraphics -lMesh\
-lGeo -lAdapt -lCommon -lDataStr -lJpeg -lPlugin -lParallel
GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"` GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"`
GMSH_SRCRPM = gmsh-$(GMSH_RELEASE) GMSH_SRCRPM = gmsh-$(GMSH_RELEASE)
GMSH_UNAME = `uname`
GMSH_SOURCES = `find . \( ! -name "*.tar*" -a ! -name "*.tgz" \ GMSH_SOURCES = `find . \( ! -name "*.tar*" -a ! -name "*.tgz" \
-a ! -name "*.o" -a ! -name "lib*.a" \ -a ! -name "*.o" -a ! -name "lib*.a" \
-a ! -name "*.msh" -a ! -name "*.bak" \ -a ! -name "*.msh" -a ! -name "*.bak" \
-a ! -name "gmsh" -a ! -name "gmsh-*"\ -a ! -name "gmsh" -a ! -name "gmsh-*"\
-a ! -type d \)` -a ! -type d \)`
GMSH_UNAME = `uname`
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Rules for developers # Rules for developers
...@@ -93,7 +95,8 @@ efence: ...@@ -93,7 +95,8 @@ efence:
gmsh2: gmsh2:
$(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \ $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -lfltk_gl -L/usr/X11R6/lib $(X11_LIB) -lpthread -lm -L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -lfltk_gl\
-L/usr/X11R6/lib $(X11_LIB) -lpthread -lm
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Utilities # Utilities
...@@ -107,7 +110,7 @@ utilities: ...@@ -107,7 +110,7 @@ utilities:
purge: purge:
for i in "." $(GMSH_DIR) $(GMSH_LIB_DIR) $(GMSH_ARCHIVE_DIR)\ for i in "." $(GMSH_DIR) $(GMSH_LIB_DIR) $(GMSH_ARCHIVE_DIR)\
$(GMSH_DEMO_DIR) $(GMSH_TUTOR_DIR) $(GMSH_DOC_DIR) $(GMSH_BOX_DIR); \ $(GMSH_DEMO_DIR) $(GMSH_TUTORIAL_DIR) $(GMSH_DOC_DIR); \
do (cd $$i && $(RM) $(RMFLAGS) *~ *~~ .gmsh-tmp .gmsh-errors gmon.out); \ do (cd $$i && $(RM) $(RMFLAGS) *~ *~~ .gmsh-tmp .gmsh-errors gmon.out); \
done done
...@@ -194,7 +197,7 @@ strip_bin: ...@@ -194,7 +197,7 @@ strip_bin:
dem: dem:
gtar zcvf gmsh-demos.tgz $(GMSH_DEMO_DIR) gtar zcvf gmsh-demos.tgz $(GMSH_DEMO_DIR)
gtar zcvf gmsh-tutorial.tgz $(GMSH_TUTOR_DIR) gtar zcvf gmsh-tutorial.tgz $(GMSH_TUTORIAL_DIR)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Black Box # Black Box
......
Makefile.Motif
+ 47
− 52
View file @ 48a9c230
# $Id: Makefile.Motif,v 1.2 2001-08-14 13:28:55 geuzaine Exp $ # $Id: Makefile.Motif,v 1.3 2001-08-15 10:03:33 geuzaine Exp $
GMSH_RELEASE = 1.23 GMSH_RELEASE = 1.23
MAKE = make MAKE = make
CC = c++ CC = c++
FLAGS = -g -Wall FLAGS = -g -Wall
RM = rm RM = rm
RMFLAGS = -f RMFLAGS = -f
# ----------------------------------------------------------------------
# Includes
# ----------------------------------------------------------------------
OPENGL_INC = -I/usr/X11R6/include\
-I/usr/include/X11/GLw\
-I$(HOME)/SOURCES/Mesa-3.1/include\
-I$(HOME)/SOURCES/Mesa-3.1/include/GL
MOTIF_INC = -I/usr/X11R6/LessTif/Motif1.2/include
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# 3rd party libraries # 3rd party libraries
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
OPENGL_LIB = -lGLU -lGL OPENGL_INC = -I/usr/X11R6/include\
OPENGL_MOTIF_LIB = -lGLw -I/usr/include/X11/GLw\
MESA_LIB = -L$(HOME)/SOURCES/Mesa-3.1/lib -lGLU -lGL -I$(HOME)/SOURCES/Mesa-3.1/include\
MESA_MOTIF_LIB = -L$(HOME)/SOURCES/Mesa-3.1/lib -lGLw -I$(HOME)/SOURCES/Mesa-3.1/include/GL
MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLU.a\ MOTIF_INC = -I/usr/X11R6/LessTif/Motif1.2/include
$(HOME)/SOURCES/Mesa-static/lib/libGL.a
MESA_MOTIF_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLw.a OPENGL_LIB = -lGLU -lGL
# XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext OPENGL_MOTIF_LIB = -lGLw
XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\ MESA_LIB = -L$(HOME)/SOURCES/Mesa-3.1/lib -lGLU -lGL
-L/usr/X11R6/lib -lXt -lX11 -lXext MESA_MOTIF_LIB = -L$(HOME)/SOURCES/Mesa-3.1/lib -lGLw
THREAD_LIB = -L/usr/lib -lpthread MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLU.a\
$(HOME)/SOURCES/Mesa-static/lib/libGL.a
MESA_MOTIF_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLw.a
# XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext
XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\
-L/usr/X11R6/lib -lXt -lX11 -lXext
THREAD_LIB = -L/usr/lib -lpthread
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Gmsh definitions # Gmsh definitions
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
GMSH_DIR = Adapt Common DataStr Geo Graphics Mesh Parser\ GMSH_DIR = Adapt Common DataStr Geo Graphics Mesh Parser\
Motif Fltk Plugin jpeg utils Parallel Motif Fltk Plugin jpeg utils Parallel
GMSH_XMOTIF_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Motif jpeg Parallel GMSH_XMOTIF_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Motif jpeg Parallel
GMSH_BOX_DIR = Adapt Box Common DataStr Geo Mesh Parser Plugin Parallel GMSH_BOX_DIR = Adapt Box Common DataStr Geo Mesh Parser Plugin Parallel
GMSH_BIN_DIR = bin GMSH_BIN_DIR = bin
GMSH_LIB_DIR = lib GMSH_LIB_DIR = lib
GMSH_DOC_DIR = doc GMSH_DOC_DIR = doc
GMSH_DEMO_DIR = demos GMSH_DEMO_DIR = demos
GMSH_TUTOR_DIR = tutorial GMSH_TUTOR_DIR = tutorial
GMSH_ARCHIVE_DIR = archives GMSH_ARCHIVE_DIR = archives
GMSH_XMOTIF_LIB = -L$(GMSH_LIB_DIR) -lMotif -lGraphics -lParser -lMesh -lGeo\
GMSH_XMOTIF_LIB = -L$(GMSH_LIB_DIR) -lMotif -lGraphics -lParser -lMesh -lGeo\ -lAdapt -lCommon -lDataStr -lJpeg -lParallel
-lAdapt -lCommon -lDataStr -lJpeg -lParallel GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo\
GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo\ -lAdapt -lPlugin -lCommon -lDataStr -lParallel
-lAdapt -lPlugin -lCommon -lDataStr -lParallel GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"`
GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"` GMSH_SRCRPM = gmsh-$(GMSH_RELEASE)
GMSH_SRCRPM = gmsh-$(GMSH_RELEASE) GMSH_SOURCES = `find . \( ! -name "*.tar*" -a ! -name "*.tgz" \
GMSH_SOURCES = `find . \( ! -name "*.tar*" -a ! -name "*.tgz" \ -a ! -name "*.o" -a ! -name "lib*.a" \
-a ! -name "*.o" -a ! -name "lib*.a" \ -a ! -name "*.msh" -a ! -name "*.bak" \
-a ! -name "*.msh" -a ! -name "*.bak" \ -a ! -name "gmsh" -a ! -name "gmsh-*"\
-a ! -name "gmsh" -a ! -name "gmsh-*"\ -a ! -type d \)`
-a ! -type d \)` GMSH_UNAME = `uname`
GMSH_UNAME = `uname`
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Rules for developers # Rules for developers
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment