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

ENH: link to general mplib* rules where possible.

Browse Source 
ENH: generalize rule for X11

ENH: Avoid move in flex/flex++ rule.
This commit is contained in:
Mark Olesen
2010-03-26 11:48:23 +01:00
parent 46d96dc855
commit 0b9e5ea11a
114 changed files with 102 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wmake/rules/General/X Normal file
View File

@ -0,0 +1,5 @@
# X11 includes and libraries in the standard location
#
XFLAGS =
XINC = $(XFLAGS) -I/usr/include/X11
XLIBS = -lXext -lX11

2
wmake/rules/General/flex
View File

@ -1,6 +1,6 @@
.SUFFIXES: .l .SUFFIXES: .l
ltoo = flex $$SOURCE ; mv lex.yy.c $*.c ; $(cc) $(cFLAGS) -c $*.c -o $@ ltoo = flex -o $*.c $$SOURCE ; $(cc) $(cFLAGS) -c $*.c -o $@
.l.dep: .l.dep:
$(MAKE_DEP) $(MAKE_DEP)

2
wmake/rules/General/flex++
View File

@ -1,6 +1,6 @@
.SUFFIXES: .L .SUFFIXES: .L
Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ Ltoo = flex -+ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@
.L.dep: .L.dep:
$(MAKE_DEP) $(MAKE_DEP)

6
wmake/rules/General/flex++.test
View File

@ -1,6 +0,0 @@
.SUFFIXES: .L
Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
.L.dep:
$(MAKE_DEP)

0
wmake/rules/linux64Gcc42/mplib → wmake/rules/General/mplib
View File

0
wmake/rules/linux64Gcc42/mplibGAMMA → wmake/rules/General/mplibGAMMA
View File

2
wmake/rules/General/mplibMPICH
View File

@ -1,3 +1,3 @@
PFLAGS = PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

0
wmake/rules/linux64Gcc42/mplibMPICH-GM → wmake/rules/General/mplibMPICH-GM
View File

3
wmake/rules/linuxGcc42/mplibOPENMPI → wmake/rules/General/mplibQSMPI
View File

@ -1,3 +1,4 @@
PFLAGS = -DOMPI_SKIP_MPICXX PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

2
wmake/rules/SiCortex64Gcc/flex++
View File

@ -1,6 +1,6 @@
.SUFFIXES: .L .SUFFIXES: .L
Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ Ltoo = flex --c++ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@
.L.dep: .L.dep:
$(MAKE_DEP) $(MAKE_DEP)

3
wmake/rules/SiCortex64Gcc/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/SiCortex64Gcc/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/SunOS64Gcc/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/SunOS64Gcc/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/SunOS64Gcc/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/SunOS64Gcc/mplibOPENMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibOPENMPI

3
wmake/rules/linux64Gcc/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/include/X11
XLIBS = -L/usr/lib64 -lXext -lX11

1
wmake/rules/linux64Gcc/X Symbolic link
View File

@ -0,0 +1 @@
../General/X

3
wmake/rules/linux64Gcc/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/linux64Gcc/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/linux64Gcc/mplibGAMMA
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma

1
wmake/rules/linux64Gcc/mplibGAMMA Symbolic link
View File

@ -0,0 +1 @@
../General/mplibGAMMA

3
wmake/rules/linux64Gcc/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

1
wmake/rules/linux64Gcc/mplibMPICH Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH

3
wmake/rules/linux64Gcc/mplibMPICH-GM
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

1
wmake/rules/linux64Gcc/mplibMPICH-GM Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH-GM

3
wmake/rules/linux64Gcc/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc/mplibOPENMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibOPENMPI

4
wmake/rules/linux64Gcc/mplibQSMPI
View File

@ -1,4 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc/mplibQSMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibQSMPI

3
wmake/rules/linux64Gcc42/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib64 -lXext -lX11

16
wmake/rules/linux64Gcc42/c
View File

@ -1,16 +0,0 @@
.SUFFIXES: .c .h
cWARN = -Wall
cc = gcc -m64
include $(RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs

21
wmake/rules/linux64Gcc42/c++
View File

@ -1,21 +0,0 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-60
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)

2
wmake/rules/linux64Gcc42/c++Debug
View File

@ -1,2 +0,0 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

4
wmake/rules/linux64Gcc42/c++Opt
View File

@ -1,4 +0,0 @@
c++DBUG =
c++OPT = -O3
#c++OPT = -march=nocona -O3
# -ftree-vectorize -ftree-vectorizer-verbose=3

2
wmake/rules/linux64Gcc42/c++Prof
View File

@ -1,2 +0,0 @@
c++DBUG = -pg
c++OPT = -O2

2
wmake/rules/linux64Gcc42/cDebug
View File

@ -1,2 +0,0 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -fdefault-inline -finline-functions

2
wmake/rules/linux64Gcc42/cOpt
View File

@ -1,2 +0,0 @@
cDBUG =
cOPT = -O3

2
wmake/rules/linux64Gcc42/cProf
View File

@ -1,2 +0,0 @@
cDBUG = -pg
cOPT = -O2

10
wmake/rules/linux64Gcc42/general
View File

@ -1,10 +0,0 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -A64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

3
wmake/rules/linux64Gcc42/mplibHPMPI
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi

3
wmake/rules/linux64Gcc42/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

3
wmake/rules/linux64Gcc42/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

3
wmake/rules/linux64Gcc43/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib64 -lXext -lX11

1
wmake/rules/linux64Gcc43/X Symbolic link
View File

@ -0,0 +1 @@
../General/X

3
wmake/rules/linux64Gcc43/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/linux64Gcc43/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/linux64Gcc43/mplibGAMMA
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma

1
wmake/rules/linux64Gcc43/mplibGAMMA Symbolic link
View File

@ -0,0 +1 @@
../General/mplibGAMMA

3
wmake/rules/linux64Gcc43/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

1
wmake/rules/linux64Gcc43/mplibMPICH Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH

3
wmake/rules/linux64Gcc43/mplibMPICH-GM
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

1
wmake/rules/linux64Gcc43/mplibMPICH-GM Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH-GM

3
wmake/rules/linux64Gcc43/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc43/mplibOPENMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibOPENMPI

4
wmake/rules/linux64Gcc43/mplibQSMPI
View File

@ -1,4 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc43/mplibQSMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibQSMPI

3
wmake/rules/linux64Gcc44/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib64 -lXext -lX11

1
wmake/rules/linux64Gcc44/X Symbolic link
View File

@ -0,0 +1 @@
../General/X

3
wmake/rules/linux64Gcc44/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/linux64Gcc44/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/linux64Gcc44/mplibGAMMA
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma

1
wmake/rules/linux64Gcc44/mplibGAMMA Symbolic link
View File

@ -0,0 +1 @@
../General/mplibGAMMA

3
wmake/rules/linux64Gcc44/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

1
wmake/rules/linux64Gcc44/mplibMPICH Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH

3
wmake/rules/linux64Gcc44/mplibMPICH-GM
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

1
wmake/rules/linux64Gcc44/mplibMPICH-GM Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH-GM

3
wmake/rules/linux64Gcc44/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc44/mplibOPENMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibOPENMPI

4
wmake/rules/linux64Gcc44/mplibQSMPI
View File

@ -1,4 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Gcc44/mplibQSMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibQSMPI

3
wmake/rules/linux64Icc/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib64 -lXext -lX11

1
wmake/rules/linux64Icc/X Symbolic link
View File

@ -0,0 +1 @@
../General/X

3
wmake/rules/linux64Icc/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/linux64Icc/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/linux64Icc/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

1
wmake/rules/linux64Icc/mplibMPICH Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH

3
wmake/rules/linux64Icc/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linux64Icc/mplibOPENMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibOPENMPI

3
wmake/rules/linuxGcc/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib -lXext -lX11

1
wmake/rules/linuxGcc/X Symbolic link
View File

@ -0,0 +1 @@
../General/X

3
wmake/rules/linuxGcc/mplib
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

1
wmake/rules/linuxGcc/mplib Symbolic link
View File

@ -0,0 +1 @@
../General/mplib

3
wmake/rules/linuxGcc/mplibGAMMA
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma

1
wmake/rules/linuxGcc/mplibGAMMA Symbolic link
View File

@ -0,0 +1 @@
../General/mplibGAMMA

3
wmake/rules/linuxGcc/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

1
wmake/rules/linuxGcc/mplibMPICH Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH

3
wmake/rules/linuxGcc/mplibMPICH-GM
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

1
wmake/rules/linuxGcc/mplibMPICH-GM Symbolic link
View File

@ -0,0 +1 @@
../General/mplibMPICH-GM

3
wmake/rules/linuxGcc/mplibOPENMPI
View File

@ -1,3 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi

1
wmake/rules/linuxGcc/mplibOPENMPI Symbolic link
View File

@ -0,0 +1 @@
../General/mplibOPENMPI

3
wmake/rules/linuxGcc42/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib -lXext -lX11

16
wmake/rules/linuxGcc42/c
View File

@ -1,16 +0,0 @@
.SUFFIXES: .c .h
cWARN = -Wall
cc = gcc -m32
include $(RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs

21
wmake/rules/linuxGcc42/c++
View File

@ -1,21 +0,0 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
CC = g++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-60
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)

2
wmake/rules/linuxGcc42/c++Debug
View File

@ -1,2 +0,0 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

2
wmake/rules/linuxGcc42/c++Opt
View File

@ -1,2 +0,0 @@
c++DBUG =
c++OPT = -O3

2
wmake/rules/linuxGcc42/c++Prof
View File

@ -1,2 +0,0 @@
c++DBUG = -pg
c++OPT = -O2

2
wmake/rules/linuxGcc42/cDebug
View File

@ -1,2 +0,0 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -finline-functions

2
wmake/rules/linuxGcc42/cOpt
View File

@ -1,2 +0,0 @@
cDBUG =
cOPT = -O3

Some files were not shown because too many files have changed in this diff Show More