Commit 7bfb2a30 authored by Lorenz Huedepohl's avatar Lorenz Huedepohl
Browse files

Fix test_project

Used the obsolete Makefile variable $(_f90_moddir), replaced with
explicit directories for the Fortran mod files for each target.

Also, added a library target as additional test
parent aea0eec5
...@@ -7,14 +7,22 @@ bin_PROGRAMS = foo test_bar test_baz ...@@ -7,14 +7,22 @@ bin_PROGRAMS = foo test_bar test_baz
foo_SOURCES = src/foo.F90 src2/baz.F90 src/bar.F90 foo_SOURCES = src/foo.F90 src2/baz.F90 src/bar.F90
foo_CPPFLAGS = -DPROGRAM_foo foo_CPPFLAGS = -DPROGRAM_foo
foo_FCFLAGS = $(FC_MODOUT)$(_f90_moddir)/foo $(FC_MODINC)$(_f90_moddir)/foo foo_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/foo $(FC_MODINC)./fortran_mod_files/foo
test_bar_SOURCES = src/bar.F90 test_bar_SOURCES = src/bar.F90
test_bar_CPPFLAGS = -DPROGRAM_test_bar test_bar_CPPFLAGS = -DPROGRAM_test_bar
test_bar_FCFLAGS = $(FC_MODOUT)$(_f90_moddir)/test_bar $(FC_MODINC)$(_f90_moddir)/test_bar test_bar_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/test_bar $(FC_MODINC)./fortran_mod_files/test_bar
test_baz_SOURCES = src2/baz.F90 src/bar.F90 test_baz_SOURCES = src2/baz.F90 src/bar.F90
test_baz_CPPFLAGS = -DPROGRAM_test_baz test_baz_CPPFLAGS = -DPROGRAM_test_baz
test_baz_FCFLAGS = $(FC_MODOUT)$(_f90_moddir)/test_baz $(FC_MODINC)$(_f90_moddir)/test_baz test_baz_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/test_baz $(FC_MODINC)./fortran_mod_files/test_baz
# a library
lib_LTLIBRARIES = libdings.la
libdings_la_SOURCES = src2/baz.F90 src/bar.F90
libdings_la_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/libdings.la $(FC_MODINC)./fortran_mod_files/libdings.la
CLEANFILES = fortran_mod_files/*/*
@FORTRAN_MODULE_DEPS@ @FORTRAN_MODULE_DEPS@
...@@ -14,6 +14,7 @@ FDEP_F90_GNU_MAKE_DEPS ...@@ -14,6 +14,7 @@ FDEP_F90_GNU_MAKE_DEPS
AC_PROG_FC AC_PROG_FC
AC_PROG_INSTALL AC_PROG_INSTALL
AM_PROG_CC_C_O AM_PROG_CC_C_O
AM_PROG_AR
# fortran stuff # fortran stuff
AC_FC_MODULE_FLAG AC_FC_MODULE_FLAG
...@@ -30,3 +31,7 @@ AC_SUBST([FC_MODOUT]) ...@@ -30,3 +31,7 @@ AC_SUBST([FC_MODOUT])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
for target in foo test_bar test_baz libdings.la; do
mkdir -p fortran_mod_files/$target
done
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment