Skip to content

Commit 5312e5f

Browse files
committed
Fix some more dependency woes
1 parent 14c1ab1 commit 5312e5f

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

.github/workflows/linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
3131
- name: Build etsf-io
3232
run: |
33-
mkdir src/group_level/
3433
bash -e autogen.sh
3534
mkdir build/
3635
cd build/

config/etsf/template.Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ libetsf_io_la_LIBADD = $(top_builddir)/src/low_level/libetsf_io_low_level.la \
2525
$(NETCDF_WRAPPERS)
2626

2727
#dependencies
28-
etsf_io.o: etsf_io.f90 \
28+
$(libetsf_io_la_OBJECTS): etsf_io.f90 \
2929
@INCLUDED_FILES@
3030

31-
ETSF_IO.@MODULE_EXT@ etsf_io.@MODULE_EXT@: etsf_io.o
31+
ETSF_IO.@MODULE_EXT@ etsf_io.@MODULE_EXT@: $(libetsf_io_la_OBJECTS)

tests/group_level/Makefile.am

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,26 @@ tests_init_SOURCES = tests_init.f90
1515
tests_init_LDFLAGS = -L$(top_builddir)/src/group_level
1616
tests_init_LDADD = $(top_builddir)/src/group_level/libetsf_io.la
1717

18-
tests_write_SOURCES = tests_module.f90 tests_write.f90
18+
tests_write_SOURCES = tests_write.f90
1919
tests_write_LDFLAGS = -L$(top_builddir)/src/group_level
20-
tests_write_LDADD = $(top_builddir)/src/group_level/libetsf_io.la
20+
tests_write_LDADD = tests_module.$(OBJEXT) $(top_builddir)/src/group_level/libetsf_io.la
21+
EXTRA_tests_write_SOURCES = tests_module.f90
22+
EXTRA_tests_write_DEPENDENCIES = tests_module.$(OBJEXT)
23+
$(tests_write_OBJECTS): tests_module.$(OBJEXT)
2124

22-
tests_read_SOURCES = tests_module.f90 tests_read.f90
25+
tests_read_SOURCES = tests_read.f90
2326
tests_read_LDFLAGS = -L$(top_builddir)/src/group_level
24-
tests_read_LDADD = $(top_builddir)/src/group_level/libetsf_io.la
27+
tests_read_LDADD = tests_module.$(OBJEXT) $(top_builddir)/src/group_level/libetsf_io.la
28+
EXTRA_tests_read_SOURCES = tests_module.f90
29+
EXTRA_tests_read_DEPENDENCIES = tests_module.$(OBJEXT)
30+
$(tests_read_OBJECTS): tests_module.$(OBJEXT)
2531

26-
tests_copy_SOURCES = tests_module.f90 tests_copy.f90
32+
tests_copy_SOURCES = tests_copy.f90
2733
tests_copy_LDFLAGS = -L$(top_builddir)/src/group_level
28-
tests_copy_LDADD = $(top_builddir)/src/group_level/libetsf_io.la
34+
tests_copy_LDADD = tests_module.$(OBJEXT) $(top_builddir)/src/group_level/libetsf_io.la
35+
EXTRA_tests_copy_SOURCES = tests_module.f90
36+
EXTRA_tests_copy_DEPENDENCIES = tests_module.$(OBJEXT)
37+
$(tests_copy_OBJECTS): tests_module.$(OBJEXT)
2938

3039
TESTS = run
3140

0 commit comments

Comments
 (0)