From f2f3a38f25b8c440014d246db72d907dc5924338 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 17 Sep 2008 19:27:48 +0000
Subject: [PATCH] *** empty log message ***
---
Common/Makefile | 2 +-
Fltk/Makefile | 2 +-
Geo/Makefile | 2 +-
Graphics/Makefile | 2 +-
Makefile | 42 ++++++++++++++++++++++++-------------
Mesh/Makefile | 2 +-
Numeric/Makefile | 2 +-
Parser/Makefile | 2 +-
Plugin/Makefile | 2 +-
Post/Makefile | 2 +-
lib/Makefile | 3 +--
utils/misc/variables.iphone | 3 +++
utils/misc/variables.msvc | 5 ++++-
variables.in | 3 +++
14 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/Common/Makefile b/Common/Makefile
index 59a2c9a29f..6d77a59829 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -47,7 +47,7 @@ cpobj: ${OBJ}
${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index d0336243e7..aef515cae1 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -43,7 +43,7 @@ res:
windres Win32Icon.rc -O coff Win32Icon.res
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Geo/Makefile b/Geo/Makefile
index be8292cd1b..0f673e99f9 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -56,7 +56,7 @@ cpobj: ${OBJ}
${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 3c09cea66e..413f850ee3 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -46,7 +46,7 @@ cpobj: ${OBJ}
${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Makefile b/Makefile
index 8a965ae11c..2274323a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,18 @@ uninstall:
rm -f ${bindir}/gmsh${EXEEXT}
rm -f ${mandir}/man1/gmsh.1
+tag:
+ echo "#define GMSH_MAJOR_VERSION ${GMSH_MAJOR_VERSION}" > ${GMSH_VERSION_FILE}
+ echo "#define GMSH_MINOR_VERSION ${GMSH_MINOR_VERSION}" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_PATCH_VERSION ${GMSH_PATCH_VERSION}" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_EXTRA_VERSION \"${GMSH_EXTRA_VERSION}\"" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_VERSION \"${GMSH_VERSION}\"" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_DATE \"`date`\"" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_HOST \"${HOSTNAME}\"" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_PACKAGER \"`whoami`\"" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_OS \"${UNAME}\"" >> ${GMSH_VERSION_FILE}
+ echo "#define GMSH_SHORT_LICENSE \"${GMSH_SHORT_LICENSE}\"" >> ${GMSH_VERSION_FILE}
+
# Rules to build the Gmsh library
.PHONY: lib
@@ -117,19 +129,31 @@ framework: lib
# Windows specific rules that will work in a DOS command window
# without any unix-type shell (only gmake.exe needs to be present)
-dos: tag
+dos: dos-tag
for %%i in (${GMSH_DIRS}) do gmake -C %%i
${LINKER} ${OPTIM} ${DASH}o bin/gmsh${EXEEXT} ${GMSH_LIBS}
-dos-lib: tag
+dos-lib: dos-tag
for %%i in (${GMSH_DIRS}); do gmake -C %%i cpobj
${AR} ${ARFLAGS}lib/libGmsh${LIBEXT} lib/*${OBJEXT}
erase lib\*${OBJEXT}
dos-clean:
- for %%i in (doc lib ${GMSH_DIRS}) do gmake -C clean
+ for %%i in (doc lib ${GMSH_DIRS}) do gmake -C %%i clean
erase Common\GmshVersion.h
+dos-tag:
+ echo #define GMSH_MAJOR_VERSION ${GMSH_MAJOR_VERSION} > ${GMSH_VERSION_FILE}
+ echo #define GMSH_MINOR_VERSION ${GMSH_MINOR_VERSION} >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_PATCH_VERSION ${GMSH_PATCH_VERSION} >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_EXTRA_VERSION "${GMSH_EXTRA_VERSION}" >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_VERSION "${GMSH_VERSION}" >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_DATE "" >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_HOST "${HOSTNAME}" >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_PACKAGER "" >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_OS "${UNAME}" >> ${GMSH_VERSION_FILE}
+ echo #define GMSH_SHORT_LICENSE ${GMSH_SHORT_LICENSE} >> ${GMSH_VERSION_FILE}
+
# Utilities
variables: configure
@@ -188,18 +212,6 @@ nodepend:
&& rm -f Makefile.new); \
done
-tag:
- echo "#define GMSH_MAJOR_VERSION ${GMSH_MAJOR_VERSION}" > ${GMSH_VERSION_FILE}
- echo "#define GMSH_MINOR_VERSION ${GMSH_MINOR_VERSION}" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_PATCH_VERSION ${GMSH_PATCH_VERSION}" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_EXTRA_VERSION \"${GMSH_EXTRA_VERSION}\"" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_VERSION \"${GMSH_VERSION}\"" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_DATE \"`date`\"" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_HOST \"${HOSTNAME}\"" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_PACKAGER \"`whoami`\"" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_OS \"${UNAME}\"" >> ${GMSH_VERSION_FILE}
- echo "#define GMSH_SHORT_LICENSE \"${GMSH_SHORT_LICENSE}\"" >> ${GMSH_VERSION_FILE}
-
initialtag:
@if [ ! -r ${GMSH_VERSION_FILE} ]; then ${MAKE} tag ; fi
diff --git a/Mesh/Makefile b/Mesh/Makefile
index a2061a6dbb..a20b72c509 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -62,7 +62,7 @@ BDS.o:
${CXX} ${FLAGS} ${INC} ${SYSINCLUDE} ${DASH}c BDS.cpp
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Numeric/Makefile b/Numeric/Makefile
index 8362e796ae..9595affa9c 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -35,7 +35,7 @@ cpobj: ${OBJ}
${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Parser/Makefile b/Parser/Makefile
index 0acfebc955..4417434848 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -42,7 +42,7 @@ parser:
flex -P gmsh_yy -oGmsh.yy.cpp Gmsh.l
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 7e92811f56..78fca96966 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -49,7 +49,7 @@ cpobj: ${OBJ}
${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Post/Makefile b/Post/Makefile
index e3bee3550b..3b5bf1c50c 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -38,7 +38,7 @@ cpobj: ${OBJ}
${CXX} ${CFLAGS} ${DASH}c $<
clean:
- rm -f *.o *.obj
+ ${RM} *.o *.obj
depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/lib/Makefile b/lib/Makefile
index e4cca22f63..fcf121ccc9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,5 @@
# bugs and problems to <gmsh@geuz.org>.
clean:
- rm -f *.a *.lib
-
+ ${RM} *.a *.lib
diff --git a/utils/misc/variables.iphone b/utils/misc/variables.iphone
index 73a8ea092a..6b65653399 100644
--- a/utils/misc/variables.iphone
+++ b/utils/misc/variables.iphone
@@ -59,6 +59,9 @@ OBJEXT=.o
LIBEXT=.a
EXEEXT=
+# File handling commands
+RM=rm -f
+
# Installation directories
prefix=/usr/local
exec_prefix=${prefix}
diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc
index 1edb50267d..2eb7b9feac 100644
--- a/utils/misc/variables.msvc
+++ b/utils/misc/variables.msvc
@@ -91,7 +91,7 @@ endif
# How you create a static library on this machine
AR=LIB
ARFLAGS=/OUT:
-RANLIB=true
+RANLIB=echo
# The symbol used in front of compiler flags
DASH=/
@@ -101,6 +101,9 @@ OBJEXT=.obj
LIBEXT=.lib
EXEEXT=.exe
+# File handling commands
+RM=erase
+
# Installation directories
prefix="S:\Lib\gmsh"
exec_prefix=${prefix}
diff --git a/variables.in b/variables.in
index a0df59649f..f445fb6461 100644
--- a/variables.in
+++ b/variables.in
@@ -46,6 +46,9 @@ OBJEXT=.o
LIBEXT=.a
EXEEXT=@EXEEXT@
+# File handling commands
+RM=rm -f
+
# Installation directories
prefix=@prefix@
exec_prefix=@exec_prefix@
--
GitLab