From 04baf58cabc019ebc3556d9f82e2fc4638b4c234 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Fri, 8 Jan 2021 19:58:09 +0100 Subject: [PATCH 1/3] Fix dependencies in manual makefile - also build in parallel using the manual makefile --- .github/workflows/CI.yml | 2 +- src/Makefile.manual | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c2e1b12a..8c14472b6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -82,7 +82,7 @@ jobs: - name: Test manual makefiles if: contains(matrix.os, 'ubuntu') && contains(matrix.gcc_v, '10') run: | - make -f Makefile.manual FYPPFLAGS="-DMAXRANK=4" + make -f Makefile.manual FYPPFLAGS="-DMAXRANK=4" -j make -f Makefile.manual test make -f Makefile.manual clean diff --git a/src/Makefile.manual b/src/Makefile.manual index dd6f12708..6f456f467 100644 --- a/src/Makefile.manual +++ b/src/Makefile.manual @@ -54,10 +54,16 @@ stdlib_io.o: \ stdlib_error.o \ stdlib_optval.o \ stdlib_kinds.o -stdlib_linalg_diag.o: stdlib_kinds.o +stdlib_linalg_diag.o: \ + stdlib_linalg.o \ + stdlib_kinds.o stdlib_logger.o: stdlib_ascii.o stdlib_optval.o stdlib_optval.o: stdlib_kinds.o stdlib_quadrature.o: stdlib_kinds.o +stdlib_quadrature_trapzd.o: \ + stdlib_error.o \ + stdlib_quadrature.o \ + stdlib_kinds.o stdlib_stats_mean.o: \ stdlib_optval.o \ stdlib_kinds.o \ @@ -66,6 +72,12 @@ stdlib_stats_moment.o: \ stdlib_optval.o \ stdlib_kinds.o \ stdlib_stats.o +stdlib_stats_moment_all.o: \ + stdlib_stats_moment.o +stdlib_stats_moment_mask.o: \ + stdlib_stats_moment.o +stdlib_stats_moment_scalar.o: \ + stdlib_stats_moment.o stdlib_stats_var.o: \ stdlib_optval.o \ stdlib_kinds.o \ From de8fa70c35dc6ac0eb853241788518247d947c36 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Fri, 8 Jan 2021 22:34:13 +0100 Subject: [PATCH 2/3] Fix typo and missing dependency from stdlib_stats to stdlib_kinds --- src/Makefile.manual | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/Makefile.manual b/src/Makefile.manual index 6f456f467..70c9c3f73 100644 --- a/src/Makefile.manual +++ b/src/Makefile.manual @@ -60,9 +60,11 @@ stdlib_linalg_diag.o: \ stdlib_logger.o: stdlib_ascii.o stdlib_optval.o stdlib_optval.o: stdlib_kinds.o stdlib_quadrature.o: stdlib_kinds.o -stdlib_quadrature_trapzd.o: \ - stdlib_error.o \ +stdlib_quadrature_trapz.o: \ stdlib_quadrature.o \ + stdlib_error.o \ + stdlib_kinds.o +stdlib_stats.o: \ stdlib_kinds.o stdlib_stats_mean.o: \ stdlib_optval.o \ @@ -82,19 +84,3 @@ stdlib_stats_var.o: \ stdlib_optval.o \ stdlib_kinds.o \ stdlib_stats.o - -# Fortran sources that are built from fypp templates -stdlib_bitsets_64.f90: stdlib_bitsets_64.fypp -stdlib_bitsets_large.f90: stdlib_bitsets_large.fypp -stdlib_bitsets.f90: stdlib_bitsets.fypp -stdlib_io.f90: stdlib_io.fypp -stdlib_linalg.f90: stdlib_linalg.fypp -stdlib_linalg_diag.f90: stdlib_linalg_diag.fypp -stdlib_quadrature.f90: stdlib_quadrature.fypp -stdlib_stats.f90: stdlib_stats.fypp -stdlib_stats_mean.f90: stdlib_stats_mean.fypp -stdlib_stats_moment.f90: stdlib_stats_moment.fypp -stdlib_stats_moment_all.f90: stdlib_stats_moment_all.fypp -stdlib_stats_moment_mask.f90: stdlib_stats_moment_mask.fypp -stdlib_stats_moment_scalar.f90: stdlib_stats_moment_scalar.fypp -stdlib_stats_var.f90: stdlib_stats_var.fypp From 84e9adf9e50b13306d79c5b599bc4bdf2a46ee01 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Fri, 8 Jan 2021 22:39:19 +0100 Subject: [PATCH 3/3] Add dependency from stdlib_linalg to stdlib_kinds --- src/Makefile.manual | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.manual b/src/Makefile.manual index 70c9c3f73..8e7ddc152 100644 --- a/src/Makefile.manual +++ b/src/Makefile.manual @@ -54,6 +54,8 @@ stdlib_io.o: \ stdlib_error.o \ stdlib_optval.o \ stdlib_kinds.o +stdlib_linalg.o: \ + stdlib_kinds.o stdlib_linalg_diag.o: \ stdlib_linalg.o \ stdlib_kinds.o