Skip to content
Snippets Groups Projects
Commit d5065760 authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

Remove the Fortran high-level interface from Autotools

parent 060e08bc
No related branches found
No related tags found
1 merge request!71Remove the Fortran high-level interface
...@@ -168,7 +168,7 @@ include: ...@@ -168,7 +168,7 @@ include:
.common_autotools: .common_autotools:
extends: .common extends: .common
variables: variables:
CONFIG_EXTRA_ARGS: --disable-fortran-hl CONFIG_EXTRA_ARGS:
MAKEFLAGS: --jobs=${JOB_COUNT} V=1 MAKEFLAGS: --jobs=${JOB_COUNT} V=1
AM_COLOR_TESTS: always AM_COLOR_TESTS: always
script: script:
......
...@@ -75,12 +75,6 @@ AC_ARG_ENABLE([examples], ...@@ -75,12 +75,6 @@ AC_ARG_ENABLE([examples],
[enable_examples=yes]) [enable_examples=yes])
AM_CONDITIONAL([ENABLE_EXAMPLES], [test x"$enable_examples" = xyes]) AM_CONDITIONAL([ENABLE_EXAMPLES], [test x"$enable_examples" = xyes])
AC_ARG_ENABLE([fortran-hl],
[AS_HELP_STRING([--enable-fortran-hl],
[enable the high-level Fortran interface @<:@default=yes@:>@])], [],
[enable_fortran_hl=yes])
AM_CONDITIONAL([ENABLE_FORTRAN_HL], [test x"$enable_fortran_hl" = xyes])
AC_ARG_ENABLE([python], AC_ARG_ENABLE([python],
[AS_HELP_STRING([--enable-python], [AS_HELP_STRING([--enable-python],
[enable the Python interface @<:@default=no@:>@])], [], [enable the Python interface @<:@default=no@:>@])], [],
......
...@@ -21,12 +21,6 @@ noinst_PROGRAMS = \ ...@@ -21,12 +21,6 @@ noinst_PROGRAMS = \
test_dace \ test_dace \
test_jd_logic \ test_jd_logic \
uniq uniq
if ENABLE_FORTRAN_HL
noinst_PROGRAMS += \
example_hl \
iconoce_hl
endif ENABLE_FORTRAN_HL
endif ENABLE_EXAMPLES endif ENABLE_EXAMPLES
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
...@@ -48,18 +42,12 @@ mo_exception_mod = MO_EXCEPTION.$(FCMODEXT) ...@@ -48,18 +42,12 @@ mo_exception_mod = MO_EXCEPTION.$(FCMODEXT)
mo_kind_mod = MO_KIND.$(FCMODEXT) mo_kind_mod = MO_KIND.$(FCMODEXT)
mtime_error_handling_mod = MTIME_ERROR_HANDLING.$(FCMODEXT) mtime_error_handling_mod = MTIME_ERROR_HANDLING.$(FCMODEXT)
mtime_mod = MTIME.$(FCMODEXT) mtime_mod = MTIME.$(FCMODEXT)
if ENABLE_FORTRAN_HL
mtime_hl_mod = MTIME_HL.$(FCMODEXT)
endif ENABLE_FORTRAN_HL
else !FCMODUC else !FCMODUC
mo_event_manager_mod = mo_event_manager.$(FCMODEXT) mo_event_manager_mod = mo_event_manager.$(FCMODEXT)
mo_exception_mod = mo_exception.$(FCMODEXT) mo_exception_mod = mo_exception.$(FCMODEXT)
mo_kind_mod = mo_kind.$(FCMODEXT) mo_kind_mod = mo_kind.$(FCMODEXT)
mtime_error_handling_mod = mtime_error_handling.$(FCMODEXT) mtime_error_handling_mod = mtime_error_handling.$(FCMODEXT)
mtime_mod = mtime.$(FCMODEXT) mtime_mod = mtime.$(FCMODEXT)
if ENABLE_FORTRAN_HL
mtime_hl_mod = mtime_hl.$(FCMODEXT)
endif ENABLE_FORTRAN_HL
endif !FCMODUC endif !FCMODUC
$(mo_event_manager_mod): mo_event_manager.$(OBJEXT) $(mo_event_manager_mod): mo_event_manager.$(OBJEXT)
...@@ -87,16 +75,6 @@ test_dace.$(OBJEXT) \ ...@@ -87,16 +75,6 @@ test_dace.$(OBJEXT) \
test_jd_logic.$(OBJEXT) \ test_jd_logic.$(OBJEXT) \
uniq.$(OBJEXT): $(top_builddir)/src/$(mtime_mod) uniq.$(OBJEXT): $(top_builddir)/src/$(mtime_mod)
if ENABLE_FORTRAN_HL
example_hl.$(OBJEXT) \
iconoce_hl.$(OBJEXT) \
simulate_iau.$(OBJEXT): $(top_builddir)/src/$(mtime_mod)
example_hl.$(OBJEXT) \
iconoce_hl.$(OBJEXT) \
simulate_iau.$(OBJEXT): $(top_builddir)/src/$(mtime_hl_mod)
endif ENABLE_FORTRAN_HL
duration.$(OBJEXT): $(mo_kind_mod) duration.$(OBJEXT): $(mo_kind_mod)
iconatm.$(OBJEXT) \ iconatm.$(OBJEXT) \
......
...@@ -34,15 +34,6 @@ libmtime_la_SOURCES = \ ...@@ -34,15 +34,6 @@ libmtime_la_SOURCES = \
mtime_constants.f90 \ mtime_constants.f90 \
mtime_error_handling.f90 mtime_error_handling.f90
if ENABLE_FORTRAN_HL
libmtime_la_SOURCES += \
libmtime_hl.f90 \
mtime_t_datetime.inc \
mtime_t_event.inc \
mtime_t_juliandelta.inc \
mtime_t_timedelta.inc
endif ENABLE_FORTRAN_HL
if FCMODUC if FCMODUC
mtime_c_bindings_mod = MTIME_C_BINDINGS.$(FCMODEXT) mtime_c_bindings_mod = MTIME_C_BINDINGS.$(FCMODEXT)
mtime_constants_mod = MTIME_CONSTANTS.$(FCMODEXT) mtime_constants_mod = MTIME_CONSTANTS.$(FCMODEXT)
...@@ -60,9 +51,6 @@ mtime_other_mods = \ ...@@ -60,9 +51,6 @@ mtime_other_mods = \
MTIME_TIMEDELTA.$(FCMODEXT) \ MTIME_TIMEDELTA.$(FCMODEXT) \
MTIME_UTILITIES.$(FCMODEXT) MTIME_UTILITIES.$(FCMODEXT)
mtime_print_by_callback_mod = MTIME_PRINT_BY_CALLBACK.$(FCMODEXT) mtime_print_by_callback_mod = MTIME_PRINT_BY_CALLBACK.$(FCMODEXT)
if ENABLE_FORTRAN_HL
mtime_hl_mod = MTIME_HL.$(FCMODEXT)
endif ENABLE_FORTRAN_HL
else !FCMODUC else !FCMODUC
mtime_c_bindings_mod = mtime_c_bindings.$(FCMODEXT) mtime_c_bindings_mod = mtime_c_bindings.$(FCMODEXT)
mtime_constants_mod = mtime_constants.$(FCMODEXT) mtime_constants_mod = mtime_constants.$(FCMODEXT)
...@@ -80,9 +68,6 @@ mtime_other_mods = \ ...@@ -80,9 +68,6 @@ mtime_other_mods = \
mtime_timedelta.$(FCMODEXT) \ mtime_timedelta.$(FCMODEXT) \
mtime_utilities.$(FCMODEXT) mtime_utilities.$(FCMODEXT)
mtime_print_by_callback_mod = mtime_print_by_callback.$(FCMODEXT) mtime_print_by_callback_mod = mtime_print_by_callback.$(FCMODEXT)
if ENABLE_FORTRAN_HL
mtime_hl_mod = mtime_hl.$(FCMODEXT)
endif ENABLE_FORTRAN_HL
endif !FCMODUC endif !FCMODUC
all_mods = \ all_mods = \
...@@ -93,11 +78,6 @@ all_mods = \ ...@@ -93,11 +78,6 @@ all_mods = \
$(mtime_other_mods) \ $(mtime_other_mods) \
$(mtime_print_by_callback_mod) $(mtime_print_by_callback_mod)
if ENABLE_FORTRAN_HL
all_mods += \
$(mtime_hl_mod)
endif ENABLE_FORTRAN_HL
nodist_include_HEADERS = $(all_mods) nodist_include_HEADERS = $(all_mods)
$(mtime_c_bindings_mod): mtime_c_bindings.lo $(mtime_c_bindings_mod): mtime_c_bindings.lo
...@@ -105,10 +85,6 @@ $(mtime_constants_mod): mtime_constants.lo ...@@ -105,10 +85,6 @@ $(mtime_constants_mod): mtime_constants.lo
$(mtime_error_handling_mod) $(mtime_print_by_callback_mod): mtime_error_handling.lo $(mtime_error_handling_mod) $(mtime_print_by_callback_mod): mtime_error_handling.lo
$(mtime_mod) $(mtime_other_mods): libmtime.lo $(mtime_mod) $(mtime_other_mods): libmtime.lo
if ENABLE_FORTRAN_HL
$(mtime_hl_mod): libmtime_hl.lo
endif ENABLE_FORTRAN_HL
$(all_mods): $(all_mods):
@if test -z $<; then \ @if test -z $<; then \
echo "Cannot find Fortran source file providing module '$(basename $(@F))'." >&2; \ echo "Cannot find Fortran source file providing module '$(basename $(@F))'." >&2; \
...@@ -128,18 +104,6 @@ mtime_c_bindings.lo: \ ...@@ -128,18 +104,6 @@ mtime_c_bindings.lo: \
mtime_iso8601.c: @MAINTAINER_MODE_TRUE@ mtime_iso8601.rl mtime_iso8601.c: @MAINTAINER_MODE_TRUE@ mtime_iso8601.rl
$(AM_V_GEN)$(RAGEL) -o $@ mtime_iso8601.rl $(AM_V_GEN)$(RAGEL) -o $@ mtime_iso8601.rl
if ENABLE_FORTRAN_HL
libmtime_hl.lo: \
$(mtime_c_bindings_mod) \
$(mtime_constants_mod) \
$(mtime_error_handling_mod) \
$(mtime_mod) \
mtime_t_datetime.inc \
mtime_t_event.inc \
mtime_t_juliandelta.inc \
mtime_t_timedelta.inc
endif ENABLE_FORTRAN_HL
MOSTLYCLEANFILES = $(all_mods) MOSTLYCLEANFILES = $(all_mods)
EXTRA_DIST = mtime_iso8601.rl EXTRA_DIST = mtime_iso8601.rl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment