From e90267a7e313a69ee8168d7ada67644312fad2e7 Mon Sep 17 00:00:00 2001 From: Eirikur Jonsson <36180221+eirikurj@users.noreply.github.com> Date: Wed, 16 Mar 2022 21:57:22 +0000 Subject: [PATCH] Update make rules with proper format (#69) * Update rules with proper format * Remove outdated rule --- Makefile | 12 ++++++------ Rules.mk | 10 ++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6eb3d44..037d4cf 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ # ****************************************************************** SUBDIR_SRC = src/modules \ - src/IO \ - src/utils \ - src/warp \ - src/adjoint/ADFirstAidKit \ - src/adjoint/outputReverse \ - src/adjoint/outputForward \ + src/IO \ + src/utils \ + src/warp \ + src/adjoint/ADFirstAidKit \ + src/adjoint/outputReverse \ + src/adjoint/outputForward \ WARP_SUBDIRS = $(SUBDIR_SRC) diff --git a/Rules.mk b/Rules.mk index 276a363..70388d0 100644 --- a/Rules.mk +++ b/Rules.mk @@ -1,26 +1,24 @@ -.F90.o: Makefile +%.o: %.F90 $(FF90) $(FF90_ALL_FLAGS) -c $< -o $(OBJDIR)/$(@F) @echo @echo " --- Compiled $*.F90 successfully ---" @echo -.f90.o: Makefile +%.o: %.f90 $(FF90) $(FF90_ALL_FLAGS) -c $< -o $(OBJDIR)/$(@F) @echo @echo " --- Compiled $*.f90 successfully ---" @echo -.f.o: Makefile +%.o: %.f $(FF90) $(FF77_ALL_FLAGS) -c $< -o $(OBJDIR)/$(@F) @echo @echo " --- Compiled $*.f successfully ---" @echo -.c.o: Makefile +%.o: %.c $(CC) $(CC_ALL_FLAGS) -c $< -o $(OBJDIR)/$(@F) @echo @echo " --- Compiled $*.c successfully ---" @echo - -%.o : %.mod \ No newline at end of file