diff options
| author | Charles BIENVENUE <charles.bienvenue@polymtl.ca> | 2025-11-06 15:59:27 +0000 |
|---|---|---|
| committer | Charles BIENVENUE <charles.bienvenue@polymtl.ca> | 2025-11-06 15:59:27 +0000 |
| commit | a64a4c4f9336ccb510a8a01c298da07845dce40b (patch) | |
| tree | 6861640d4937c3805b17f849b042ae425e4705c0 /Dragon/src/Makefile | |
| parent | f6804c8ce4114837ff6845ff11364cbfb057c918 (diff) | |
| parent | 777a180920d1a23baf685523840ef49def37fecf (diff) | |
Merge branch 'parallel-make-correction-1' into 'main'
Correction of an error when running make -jN for the first time.
See merge request dragon/5.1!20
Diffstat (limited to 'Dragon/src/Makefile')
| -rw-r--r-- | Dragon/src/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Dragon/src/Makefile b/Dragon/src/Makefile index b423600..0af9e76 100644 --- a/Dragon/src/Makefile +++ b/Dragon/src/Makefile @@ -228,16 +228,16 @@ sub-make: $(MAKE) openmp=$(openmp) intel=$(intel) nvidia=$(nvidia) llvm=$(llvm) hdf5=$(hdf5) -C ../../Utilib/src $(MAKE) openmp=$(openmp) intel=$(intel) nvidia=$(nvidia) llvm=$(llvm) hdf5=$(hdf5) -C ../../Ganlib/src $(MAKE) openmp=$(openmp) intel=$(intel) nvidia=$(nvidia) llvm=$(llvm) hdf5=$(hdf5) -C ../../Trivac/src -%.o : %.c +%.o : %.c | sub-make $(C) $(CFLAGS) $(opt) $(COMP) -c $< -o $@ -%.o : %.f90 +%.o : %.f90 | sub-make $(F90) $(FFLAGS) $(opt) $(COMP) $(INCLUDE) -c $< -o $@ -%.o : %.F90 +%.o : %.F90 | sub-make # Use Fortran compiler's integrated preprocessor instead of cpp -traditional $(F90) $(FFLAGS) $(opt) $(COMP) $(INCLUDE) $(FLAGS) -c $< -o $@ -%.o : %.f +%.o : %.f | sub-make $(F90) $(FFLAG77) $(opt) $(COMP) $(INCLUDE) -c $< -o $@ -%.o : %.F +%.o : %.F | sub-make # Use Fortran compiler's integrated preprocessor only for .F (not for .f) $(F90) $(FFLAG77) -cpp $(opt) $(COMP) $(INCLUDE) $(FLAGS) -c $< -o $@ $(lib_module)/: |