TREX/qmckl
1
0
Fork 0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2024-12-22 20:36:01 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Fortran dependencies in parallel builds

Browse Source
This commit is contained in:
Anthony Scemama 2023-03-02 11:10:44 +01:00
parent 3ebb304218
commit da70f7a032
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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_SOURCES = $(qmckl_h) $(qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES)
src_libqmckl_la_LDFLAGS = $(LDFLAGS) 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 include generated.mk

10
tools/build_makefile.py
View File

@ -135,14 +135,14 @@ def main():
F_FILES += [F90] F_FILES += [F90]
if F90 in DEPS: if F90 in DEPS:
DEPS[F90] += [tangled, "$(src_qmckl_fo)"] DEPS[F90] += [tangled, "$(qmckl_fo)"]
else: else:
DEPS[F90] = [tangled, "$(src_qmckl_fo)"] DEPS[F90] = [tangled, "$(qmckl_fo)"]
if fo in DEPS: if fo in DEPS:
DEPS[fo] += [F90, "$(src_qmckl_fo)"] DEPS[fo] += [F90, "$(qmckl_fo)"]
else: else:
DEPS[fo] = [F90, "$(src_qmckl_fo)"] DEPS[fo] = [F90, "$(qmckl_fo)"]
if "(eval fh_func)" in grep: if "(eval fh_func)" in grep:
FH_FUNC_FILES += [fh_func] FH_FUNC_FILES += [fh_func]
@ -232,7 +232,7 @@ def main():
if DEPS[f][-1].endswith(".tangled"): if DEPS[f][-1].endswith(".tangled"):
output += [ f + ": " + " ".join(DEPS[f]) ] output += [ f + ": " + " ".join(DEPS[f]) ]
output += [ "endif", output += [ "endif",
"$(src_qmckl_fo): $(src_qmckl_f)" ] "$(qmckl_fo): $(qmckl_f)" ]
for f in sorted(DEPS.keys()): for f in sorted(DEPS.keys()):
if not DEPS[f][-1].endswith(".tangled"): if not DEPS[f][-1].endswith(".tangled"):
output += [ f + ": include/config.h " + " ".join(DEPS[f]) ] output += [ f + ": include/config.h " + " ".join(DEPS[f]) ]