TREX/qmckl
1
0
Fork 0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2025-01-03 01:56:18 +01:00
Code Issues Projects Releases Wiki Activity

Fixed parallel build with Fortran

Browse Source
This commit is contained in:
Anthony Scemama 2023-09-26 15:57:35 +02:00
parent ab596fe408
commit 47c4ee7d01
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -46,6 +46,7 @@ pkgconfig_DATA = pkgconfig/qmckl.pc
qmckl_h = include/qmckl.h qmckl_h = include/qmckl.h
qmckl_f = include/qmckl_f.F90 qmckl_f = include/qmckl_f.F90
qmckl_fo = include/qmckl_f.o
include_HEADERS = $(qmckl_h) $(qmckl_f) include_HEADERS = $(qmckl_h) $(qmckl_f)
header_tests = tests/chbrclf.h tests/n2.h header_tests = tests/chbrclf.h tests/n2.h
@ -61,7 +62,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) $(qmckl_fo) $(test_qmckl_o) $(FH_TYPE_FILES) $(FH_FUNC_FILES) CLEANFILES+=$(qmckl_fo) $(test_qmckl_o) $(FH_TYPE_FILES) $(FH_FUNC_FILES)
include generated.mk include generated.mk

11
tools/build_makefile.py
View File

@ -178,14 +178,14 @@ def main():
F_TEST_FILES += [f_test] F_TEST_FILES += [f_test]
if f_test in DEPS: if f_test in DEPS:
DEPS_TEST[f_test] += [tangled, "$(test_qmckl_fo)"] DEPS_TEST[f_test] += [tangled]
else: else:
DEPS_TEST[f_test] = [tangled, "$(test_qmckl_fo)"] DEPS_TEST[f_test] = [tangled]
if c_test_x in TESTS: if c_test_x in TESTS:
TESTS[c_test_x] += [f_test, "$(test_qmckl_fo)"] TESTS[c_test_x] += [f_test]
else: else:
TESTS[c_test_x] = [f_test, "$(test_qmckl_fo)"] TESTS[c_test_x] = [f_test]
output = ["", output = ["",
"## Source files", "## Source files",
@ -240,8 +240,7 @@ def main():
output+= ["", output+= ["",
"## Test files", "## Test files",
"", "",
"$(header_tests): $(TANGLED_FILES)", "$(header_tests): $(TANGLED_FILES)" ]
"$(test_qmckl_fo): $(test_qmckl_f)"]
output += ["", output += ["",
"check_PROGRAMS = $(TESTS)" ] "check_PROGRAMS = $(TESTS)" ]
for f in sorted(TESTS.keys()): for f in sorted(TESTS.keys()):