diff options
Diffstat (limited to 'src/make.configuration.defn')
| -rw-r--r-- | src/make.configuration.defn | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn index 37d5b60..0b2dbcc 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -17,7 +17,7 @@ $(NAME): MissingPETSC_DIR .pseudo: MissingPETSC_DIR MissingPETSC_DIR: @echo "PETSc: need environment variable PETSC_DIR for compliling EllPETSc" - @echo "PETSc: set PETSC_DIR or remove EllPETSc from Thornlist" + @echo "PETSc: set PETSC_DIR or remove EllPETSc from ThornList" exit 2 endif @@ -26,48 +26,34 @@ $(NAME): MissingPETSC_ARCH .pseudo: MissingPETSC_ARCH MissingPETSC_ARCH: @echo "PETSc: need environment variable PETSC_ARCH for compliling EllPETSc" - @echo "PETSc: set PETSC_ARCH or remove EllPETSc from Thornlist" + @echo "PETSc: set PETSC_ARCH or remove EllPETSc from ThornList" exit 2 endif +PETSC_LIB_DIR = $(PETSC_DIR)/lib/libg/$(PETSC_ARCH) +PETSC_LIBS = petscts petscsnes petscsles petscdm petscmat petscvec petsc +PLATFORM_LIBS = -LIBDIRS += $(PETSC_DIR)/lib/libO/$(PETSC_ARCH) $(X_LIB_DIR) - - -### PETSC on the T3E -ifeq ($(PETSC_ARCH),t3e) - echo "No T3E support" - exit 2 - MYLIBS := petscts petscsnes petscsles \ - petscmat petscvec petscsys X11 sci - - LIBS = $(MYLIBS) +### PETSC on the Origin +ifeq ($(PETSC_ARCH),IRIX64) + PLATFORM_LIBS = blas complib.sgimath +endif +### PETSC on linux +ifeq ($(PETSC_ARCH),linux) + PLATFORM_LIBS = lapack blas g2c mpich endif -### PETSC on the SGI -ifeq ($(PETSC_ARCH),sgi) - echo "No SGI support" +### Otherwise +ifndef PLATFORM_LIBS +UnknownArch: + @echo "No Cactus/PETSc support for PETSC_ARCH=$(PETSC_ARCH)" exit 2 - MYLIBS := petscts petscsnes petscsles \ - petscmat petscvec petscsys X11 \ - complib.sgimath - - LIBS = $(MYLIBS) - endif -### PETSC on linux -ifeq ($(PETSC_ARCH),linux) - MYLIBS := petsc petscdm petsccontrib \ - petscts petscsnes petscsles \ - petscmat petscvec \ - lapack blas g2c \ - mpich X11 $(LIBS) - - LIBS = $(MYLIBS) +LIBDIRS += $(PETSC_LIB_DIR) $(X_LIB_DIR) +LIBS += $(PETSC_LIBS) $(PLATFORM_LIBS) X11 +EXTRAFLAGS = -I$(PETSC_DIR)/include - EXTRAFLAGS = -I$(PETSC_DIR)/bmake/$(PETSC_ARCH)/base -endif |