From fe483a769f53d260caf1364277b4bc63287badee Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer <akohlmey@gmail.com> Date: Fri, 15 Jun 2018 15:35:34 -0400 Subject: [PATCH] update makefiles in lib/linalg to support .F files in addition to .f files --- lib/linalg/Makefile.gfortran | 7 ++++--- lib/linalg/Makefile.mpi | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/linalg/Makefile.gfortran b/lib/linalg/Makefile.gfortran index 7e1d97a5bc..2a777099e9 100644 --- a/lib/linalg/Makefile.gfortran +++ b/lib/linalg/Makefile.gfortran @@ -7,13 +7,14 @@ SHELL = /bin/sh # ------ FILES ------ SRC = $(wildcard *.f) +SRC1 = $(wildcard *.F) -FILES = $(SRC) Makefile.* README +FILES = $(SRC) $(SRC1) Makefile.* README # ------ DEFINITIONS ------ LIB = liblinalg.a -OBJ = $(SRC:.f=.o) +OBJ = $(SRC:.f=.o) $(SRC1:.F=.o) # ------ SETTINGS ------ @@ -34,7 +35,7 @@ lib: $(OBJ) # ------ COMPILE RULES ------ %.o:%.F - $(F90) $(F90FLAGS) -c $< + $(FC) $(FFLAGS) -c $< %.o:%.f $(FC) $(FFLAGS) -c $< diff --git a/lib/linalg/Makefile.mpi b/lib/linalg/Makefile.mpi index dd22ff134c..26bfab4c80 100644 --- a/lib/linalg/Makefile.mpi +++ b/lib/linalg/Makefile.mpi @@ -7,13 +7,14 @@ SHELL = /bin/sh # ------ FILES ------ SRC = $(wildcard *.f) +SRC1 = $(wildcard *.F) -FILES = $(SRC) Makefile.* README +FILES = $(SRC) $(SRC1) Makefile.* README # ------ DEFINITIONS ------ LIB = liblinalg.a -OBJ = $(SRC:.f=.o) +OBJ = $(SRC:.f=.o) $(SRC1:.F=.o) # ------ SETTINGS ------ @@ -34,7 +35,7 @@ lib: $(OBJ) # ------ COMPILE RULES ------ %.o:%.F - $(F90) $(F90FLAGS) -c $< + $(FC) $(FFLAGS) -c $< %.o:%.f $(FC) $(FFLAGS) -c $< -- GitLab