zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed wmake/utilbin to wmake/bin.

Browse Source
This commit is contained in:
henry
2009-07-17 15:39:16 +01:00
parent 99a27c893d
commit 81b6fff674
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wmake/Makefile
View File

@ -106,7 +106,7 @@ SEXE = a.out
GENERAL_RULES = $(WM_DIR)/rules/General GENERAL_RULES = $(WM_DIR)/rules/General
RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER) RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER) BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
include $(GENERAL_RULES)/general include $(GENERAL_RULES)/general
include $(RULES)/general include $(RULES)/general

6
wmake/scripts/makeFiles
View File

@ -39,7 +39,7 @@ then
exit 1 exit 1
fi fi
utilbin=$WM_DIR/utilbin/$WM_ARCH$WM_COMPILER bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER
[ -d Make ] || mkdir Make [ -d Make ] || mkdir Make
rm -f Make/files rm -f Make/files
@ -51,7 +51,7 @@ do
if [ $dir != . ] if [ $dir != . ]
then then
baseDir=`echo $dir | sed 's%^\./%%'` baseDir=`echo $dir | sed 's%^\./%%'`
baseDirName=`echo $baseDir | $utilbin/dirToString` baseDirName=`echo $baseDir | $bin/dirToString`
if [ $baseDirName != Make ] if [ $baseDirName != Make ]
then then
@ -66,7 +66,7 @@ files=`find . -name "*.[cCylfF]" -type f -print`
for file in $files for file in $files
do do
pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $utilbin/dirToString` pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString`
fileName=`echo ${file##*/}` fileName=`echo ${file##*/}`
if [ "$pathName" != "" ] if [ "$pathName" != "" ]

18
wmake/src/Makefile
View File

@ -43,22 +43,22 @@ SHELL = /bin/sh
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .o .SUFFIXES: .o
UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER) BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
all: $(UTILBIN)/dirToString $(UTILBIN)/wmkdep all: $(BIN)/dirToString $(BIN)/wmkdep
clean: clean:
rm -f $(UTILBIN)/dirToString $(UTILBIN)/wmkdep 2>/dev/null rm -f $(BIN)/dirToString $(BIN)/wmkdep 2>/dev/null
$(UTILBIN)/dirToString: dirToString.c $(BIN)/dirToString: dirToString.c
@mkdir -p $(UTILBIN) @mkdir -p $(BIN)
$(cc) $(cFLAGS) dirToString.c -o $(UTILBIN)/dirToString $(cc) $(cFLAGS) dirToString.c -o $(BIN)/dirToString
$(UTILBIN)/wmkdep: wmkdep.l $(BIN)/wmkdep: wmkdep.l
@mkdir -p $(UTILBIN) @mkdir -p $(BIN)
flex wmkdep.l flex wmkdep.l
$(cc) $(cFLAGS) lex.yy.c -o $(UTILBIN)/wmkdep $(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

4
wmake/src/dirToString.c
View File

@ -34,10 +34,10 @@ Usage
e.g. e.g.
using sh using sh
baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString` baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString`
using csh using csh
set baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString` set baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString`
\*----------------------------------------------------------------------------*/ \*----------------------------------------------------------------------------*/