diff --git a/Allwmake b/Allwmake index 5acded1..7e009ec 100755 --- a/Allwmake +++ b/Allwmake @@ -92,7 +92,10 @@ echo " $SCOTCH_ARCH_PATH" SCOTCH_SOURCE_DIR=$sourceBASE/$SCOTCH_VERSION # Needs generalizing, but works fairly well -scotchMakefile=../../etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM +scotchMakefile=etc/makeFiles/scotch/Makefile.inc.OpenFOAM-"$(uname -s)".shlib + +[ -f $scotchMakefile ] || \ + scotchMakefile=${scotchMakefile%/*}/Makefile.inc.OpenFOAM-Linux.shlib if [ -f $SCOTCH_ARCH_PATH/include/scotch.h \ -a -r $FOAM_EXT_LIBBIN/libscotch.$SO \ @@ -123,6 +126,9 @@ then mkdir -p $incDIR 2>/dev/null mkdir -p $libDIR 2>/dev/null + # Makefile relative to this directory + scotchMakefile=../../$scotchMakefile + if [ -f $scotchMakefile ] then rm -f Makefile.inc diff --git a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib new file mode 100644 index 0000000..3262a61 --- /dev/null +++ b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib @@ -0,0 +1,45 @@ +#-------------------------------*- makefile -*--------------------------------- +# OpenFOAM notes: +# +# WM_CFLAGS, WM_LDFLAGS contain "-m32 -fPIC" etc +# WM_LABEL_SIZE == 64 for 'long' instead of 'int' for OpenFOAM labels +# +# - compiled without pthread +# +# Normally set CCS, CCP by caller + +EXE = +LIB = .dylib +OBJ = .o + +AR = $(CC) +ARFLAGS = $(WM_CFLAGS) -dynamiclib -undefined dynamic_lookup -o +CCS ?= $(CC) +CCP ?= mpicc +CCD = $(CCP) +CFLAGS = $(WM_CFLAGS) -O3 \ + -DCOMMON_FILE_COMPRESS_GZ \ + -DCOMMON_RANDOM_FIXED_SEED \ + -DSCOTCH_DETERMINISTIC \ + -DSCOTCH_RENAME \ + -Drestrict=__restrict + +# 32-bit vs. 64-bit labels +ifeq ($(WM_LABEL_SIZE),64) +CFLAGS += -DINTSIZE64 +endif + +CLIBFLAGS = +LDFLAGS = $(WM_LDFLAGS) -lz -lm + +MAKE = make +CP = cp +CAT = cat +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = echo +LEX = flex -Pscotchyy -olex.yy.c +YACC = bison -pscotchyy -y -b y + +#------------------------------------------------------------------------------ diff --git a/etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib similarity index 100% rename from etc/makeFiles/scotch/Makefile.inc.i686_pc_linux2.shlib-OpenFOAM rename to etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib