diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f83b1365ee403fd10c263344585b1ab255d84be5..40ae4354b00c9e0a003d5d37e60781fde76f58e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,7 +168,7 @@ include: .common_autotools: extends: .common variables: - CONFIG_EXTRA_ARGS: --disable-fortran-hl + CONFIG_EXTRA_ARGS: MAKEFLAGS: --jobs=${JOB_COUNT} V=1 AM_COLOR_TESTS: always script: diff --git a/configure.ac b/configure.ac index f8bb0e1916b65184a2abf8d2fc6dc9ff2bb6ef49..0e8d03ed27a16f5dfa524d4fdb4f53c9faea4db3 100644 --- a/configure.ac +++ b/configure.ac @@ -75,12 +75,6 @@ AC_ARG_ENABLE([examples], [enable_examples=yes]) 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], [AS_HELP_STRING([--enable-python], [enable the Python interface @<:@default=no@:>@])], [], diff --git a/examples/Makefile.am b/examples/Makefile.am index 4bb9041822412db0add9ee875ffac3d5084844a6..0d8984e43aec5282b00ce6f274d0a1d60760dc5b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -21,12 +21,6 @@ noinst_PROGRAMS = \ test_dace \ test_jd_logic \ uniq - -if ENABLE_FORTRAN_HL -noinst_PROGRAMS += \ - example_hl \ - iconoce_hl -endif ENABLE_FORTRAN_HL endif ENABLE_EXAMPLES AM_CPPFLAGS = -I$(top_srcdir)/include @@ -48,18 +42,12 @@ mo_exception_mod = MO_EXCEPTION.$(FCMODEXT) mo_kind_mod = MO_KIND.$(FCMODEXT) mtime_error_handling_mod = MTIME_ERROR_HANDLING.$(FCMODEXT) mtime_mod = MTIME.$(FCMODEXT) -if ENABLE_FORTRAN_HL -mtime_hl_mod = MTIME_HL.$(FCMODEXT) -endif ENABLE_FORTRAN_HL else !FCMODUC mo_event_manager_mod = mo_event_manager.$(FCMODEXT) mo_exception_mod = mo_exception.$(FCMODEXT) mo_kind_mod = mo_kind.$(FCMODEXT) mtime_error_handling_mod = mtime_error_handling.$(FCMODEXT) mtime_mod = mtime.$(FCMODEXT) -if ENABLE_FORTRAN_HL -mtime_hl_mod = mtime_hl.$(FCMODEXT) -endif ENABLE_FORTRAN_HL endif !FCMODUC $(mo_event_manager_mod): mo_event_manager.$(OBJEXT) @@ -87,16 +75,6 @@ test_dace.$(OBJEXT) \ test_jd_logic.$(OBJEXT) \ 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) iconatm.$(OBJEXT) \ diff --git a/src/Makefile.am b/src/Makefile.am index 61468acebd3332ff47e5b222d1408d3475903bf3..3dd379891a275f49fe308af96fa2eb35384c6536 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,15 +34,6 @@ libmtime_la_SOURCES = \ mtime_constants.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 mtime_c_bindings_mod = MTIME_C_BINDINGS.$(FCMODEXT) mtime_constants_mod = MTIME_CONSTANTS.$(FCMODEXT) @@ -60,9 +51,6 @@ mtime_other_mods = \ MTIME_TIMEDELTA.$(FCMODEXT) \ MTIME_UTILITIES.$(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 mtime_c_bindings_mod = mtime_c_bindings.$(FCMODEXT) mtime_constants_mod = mtime_constants.$(FCMODEXT) @@ -80,9 +68,6 @@ mtime_other_mods = \ mtime_timedelta.$(FCMODEXT) \ mtime_utilities.$(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 all_mods = \ @@ -93,11 +78,6 @@ all_mods = \ $(mtime_other_mods) \ $(mtime_print_by_callback_mod) -if ENABLE_FORTRAN_HL -all_mods += \ - $(mtime_hl_mod) -endif ENABLE_FORTRAN_HL - nodist_include_HEADERS = $(all_mods) $(mtime_c_bindings_mod): mtime_c_bindings.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_mod) $(mtime_other_mods): libmtime.lo -if ENABLE_FORTRAN_HL -$(mtime_hl_mod): libmtime_hl.lo -endif ENABLE_FORTRAN_HL - $(all_mods): @if test -z $<; then \ echo "Cannot find Fortran source file providing module '$(basename $(@F))'." >&2; \ @@ -128,18 +104,6 @@ mtime_c_bindings.lo: \ mtime_iso8601.c: @MAINTAINER_MODE_TRUE@ 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) EXTRA_DIST = mtime_iso8601.rl