From da70f7a0320497c4cb4de88a20af6e87990ff5b8 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 2 Mar 2023 11:10:44 +0100 Subject: [PATCH] Fixed Fortran dependencies in parallel builds --- Makefile.am | 2 +- tools/build_makefile.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 98fc144..8a7ef7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,7 @@ lib_LTLIBRARIES = src/libqmckl.la src_libqmckl_la_SOURCES = $(qmckl_h) $(qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) src_libqmckl_la_LDFLAGS = $(LDFLAGS) -CLEANFILES+=$(test_qmckl_fo) $(src_qmckl_fo) $(test_qmckl_o) $(src_qmckl_o) $(FH_TYPE_FILES) $(FH_FUNC_FILES) +CLEANFILES+=$(test_qmckl_fo) $(qmckl_fo) $(test_qmckl_o) $(FH_TYPE_FILES) $(FH_FUNC_FILES) include generated.mk diff --git a/tools/build_makefile.py b/tools/build_makefile.py index 6a62254..d44a0bf 100755 --- a/tools/build_makefile.py +++ b/tools/build_makefile.py @@ -135,14 +135,14 @@ def main(): F_FILES += [F90] if F90 in DEPS: - DEPS[F90] += [tangled, "$(src_qmckl_fo)"] + DEPS[F90] += [tangled, "$(qmckl_fo)"] else: - DEPS[F90] = [tangled, "$(src_qmckl_fo)"] + DEPS[F90] = [tangled, "$(qmckl_fo)"] if fo in DEPS: - DEPS[fo] += [F90, "$(src_qmckl_fo)"] + DEPS[fo] += [F90, "$(qmckl_fo)"] else: - DEPS[fo] = [F90, "$(src_qmckl_fo)"] + DEPS[fo] = [F90, "$(qmckl_fo)"] if "(eval fh_func)" in grep: FH_FUNC_FILES += [fh_func] @@ -232,7 +232,7 @@ def main(): if DEPS[f][-1].endswith(".tangled"): output += [ f + ": " + " ".join(DEPS[f]) ] output += [ "endif", - "$(src_qmckl_fo): $(src_qmckl_f)" ] + "$(qmckl_fo): $(qmckl_f)" ] for f in sorted(DEPS.keys()): if not DEPS[f][-1].endswith(".tangled"): output += [ f + ": include/config.h " + " ".join(DEPS[f]) ]