diff options
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/src/CMakeLists.txt | 14 | ||||
-rw-r--r-- | fortran/src/H5_buildiface.F90 (renamed from fortran/src/H5test_kind.F90) | 0 | ||||
-rw-r--r-- | fortran/src/Makefile.am | 16 | ||||
-rw-r--r-- | fortran/src/Makefile.in | 36 |
4 files changed, 33 insertions, 33 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 5317346..51a5eb4 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -42,35 +42,35 @@ configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5fort_type_defines.h.in ${HDF5_F90_B # H5fort_type_defines.h used to generate H5f90i_gen.h + H5fortran_types.F90 #----------------------------------------------------------------------------- -add_executable (H5test_FortranHavekind - ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind.F90 +add_executable (H5_buildiface + ${HDF5_F90_SRC_SOURCE_DIR}/H5_buildiface.F90 ) if (WIN32 AND MSVC) if (BUILD_SHARED_LIBS) - set_target_properties (H5test_FortranHavekind + set_target_properties (H5_buildiface PROPERTIES COMPILE_FLAGS "/MT" ) endif (BUILD_SHARED_LIBS) - set_target_properties (H5test_FortranHavekind + set_target_properties (H5_buildiface PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE" ) endif (WIN32 AND MSVC) -set_target_properties (H5test_FortranHavekind PROPERTIES +set_target_properties (H5_buildiface PROPERTIES LINKER_LANGUAGE Fortran Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY} ) -set (CMD $<TARGET_FILE:H5test_FortranHavekind>) +set (CMD $<TARGET_FILE:H5_buildiface>) add_custom_command ( OUTPUT ${HDF5_F90_BINARY_DIR}/H5fortran_detect.F90 ${HDF5_F90_BINARY_DIR}/H5_KINDff.F90 COMMAND ${CMD} ARGS > ${HDF5_F90_BINARY_DIR}/H5fortran_detect.F90 WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} - DEPENDS H5test_FortranHavekind + DEPENDS H5_buildiface ) #----------------------------------------------------------------------------- #add_executable (H5fortran_detect diff --git a/fortran/src/H5test_kind.F90 b/fortran/src/H5_buildiface.F90 index f73f915..f73f915 100644 --- a/fortran/src/H5test_kind.F90 +++ b/fortran/src/H5_buildiface.F90 diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index d2e06f8..5f6c8e8 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -106,14 +106,14 @@ endif # programs. # It's a bit tricky to make sure that Automake builds things in the right # order (especially when using 'gmake -j ...') -# H5test_kind is compiled and run to produce H5fortran_detect.F90. +# H5_buildiface is compiled and run to produce H5KIND***. # H5fortran_detect is compiled and run to produce H5fort_type_defines.h. # H5match_types.c then includes this file and can be compiled into # H5match_types. When H5match_types is run, it creates H5f90i_gen.h # and H5fortran_types.F90, which are included in the Fortran library. # These are the helper programs we need to build. -noinst_PROGRAMS = H5match_types H5test_kind +noinst_PROGRAMS = H5match_types H5_buildiface # Tell Automake to create H5f90i_gen.h before it builds the library # sources. When it creates H5f90i_gen.h, it will create @@ -137,16 +137,16 @@ H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT) # files. #H5fortran_detect_SOURCES = H5fortran_detect.F90 -# H5test_kind.F90 generates all the APIs that have a KIND type associated +# H5_buildiface.F90 generates all the APIs that have a KIND type associated # with them. -H5_KINDff.F90: H5test_kind$(EXEEXT) - $(RUNSERIAL) ./H5test_kind$(EXEEXT) +H5_KINDff.F90: H5_buildiface$(EXEEXT) + $(RUNSERIAL) ./H5_buildiface$(EXEEXT) -# H5test_kind.F90 is included in the distribution, and Automake knows +# H5_buildiface.F90 is included in the distribution, and Automake knows # how to compile a fortran program given its sources. -H5test_kind_SOURCES = H5test_kind.F90 +H5_buildiface_SOURCES = H5_buildiface.F90 # Mark this directory as part of the Fortran API FORTRAN_API=yes @@ -158,7 +158,7 @@ FORTRAN_API=yes H5f90global.lo: $(srcdir)/H5f90global.F90 H5fortran_types.lo #H5fortran_types.lo: H5fortran_types.F90 #H5fortran_detect.lo: H5fortran_detect.F90 -H5test_kind.lo: $(srcdir)/H5test_kind.F90 +H5_buildiface.lo: $(srcdir)/H5_buildiface.F90 H5_ff.lo: $(srcdir)/H5_ff.F90 H5f90global.lo H5Aff.lo: $(srcdir)/H5Aff.F90 H5f90global.lo H5Dff.lo: $(srcdir)/H5Dff.F90 H5f90global.lo diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 052e4a0..30867e2 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -108,7 +108,7 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \ # want to build a shared C library and a static Fortran library. If so, # pass the -static flag to the library linker. @FORTRAN_SHARED_CONDITIONAL_FALSE@am__append_1 = -static -noinst_PROGRAMS = H5match_types$(EXEEXT) H5test_kind$(EXEEXT) +noinst_PROGRAMS = H5match_types$(EXEEXT) H5_buildiface$(EXEEXT) TESTS = subdir = fortran/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -166,12 +166,12 @@ libhdf5_fortran_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \ $(AM_FCFLAGS) $(FCFLAGS) $(libhdf5_fortran_la_LDFLAGS) \ $(LDFLAGS) -o $@ PROGRAMS = $(noinst_PROGRAMS) +am_H5_buildiface_OBJECTS = H5_buildiface.$(OBJEXT) +H5_buildiface_OBJECTS = $(am_H5_buildiface_OBJECTS) +H5_buildiface_LDADD = $(LDADD) H5match_types_SOURCES = H5match_types.c H5match_types_OBJECTS = H5match_types.$(OBJEXT) H5match_types_LDADD = $(LDADD) -am_H5test_kind_OBJECTS = H5test_kind.$(OBJEXT) -H5test_kind_OBJECTS = $(am_H5test_kind_OBJECTS) -H5test_kind_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -231,10 +231,10 @@ AM_V_FC = $(am__v_FC_@AM_V@) am__v_FC_ = $(am__v_FC_@AM_DEFAULT_V@) am__v_FC_0 = @echo " FC " $@; am__v_FC_1 = -SOURCES = $(libhdf5_fortran_la_SOURCES) H5match_types.c \ - $(H5test_kind_SOURCES) -DIST_SOURCES = $(libhdf5_fortran_la_SOURCES) H5match_types.c \ - $(H5test_kind_SOURCES) +SOURCES = $(libhdf5_fortran_la_SOURCES) $(H5_buildiface_SOURCES) \ + H5match_types.c +DIST_SOURCES = $(libhdf5_fortran_la_SOURCES) $(H5_buildiface_SOURCES) \ + H5match_types.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -768,9 +768,9 @@ MOSTLYCLEANFILES = H5fortran_types.F90 H5f90i_gen.h H5fort_type_defines.h # H5fortran_types.F90 as a side effect. BUILT_SOURCES = H5f90i_gen.h -# H5test_kind.F90 is included in the distribution, and Automake knows +# H5_buildiface.F90 is included in the distribution, and Automake knows # how to compile a fortran program given its sources. -H5test_kind_SOURCES = H5test_kind.F90 +H5_buildiface_SOURCES = H5_buildiface.F90 # Mark this directory as part of the Fortran API FORTRAN_API = yes @@ -893,14 +893,14 @@ clean-noinstPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +H5_buildiface$(EXEEXT): $(H5_buildiface_OBJECTS) $(H5_buildiface_DEPENDENCIES) $(EXTRA_H5_buildiface_DEPENDENCIES) + @rm -f H5_buildiface$(EXEEXT) + $(AM_V_FCLD)$(FCLINK) $(H5_buildiface_OBJECTS) $(H5_buildiface_LDADD) $(LIBS) + H5match_types$(EXEEXT): $(H5match_types_OBJECTS) $(H5match_types_DEPENDENCIES) $(EXTRA_H5match_types_DEPENDENCIES) @rm -f H5match_types$(EXEEXT) $(AM_V_CCLD)$(LINK) $(H5match_types_OBJECTS) $(H5match_types_LDADD) $(LIBS) -H5test_kind$(EXEEXT): $(H5test_kind_OBJECTS) $(H5test_kind_DEPENDENCIES) $(EXTRA_H5test_kind_DEPENDENCIES) - @rm -f H5test_kind$(EXEEXT) - $(AM_V_FCLD)$(FCLINK) $(H5test_kind_OBJECTS) $(H5test_kind_LDADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1407,11 +1407,11 @@ H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT) # files. #H5fortran_detect_SOURCES = H5fortran_detect.F90 -# H5test_kind.F90 generates all the APIs that have a KIND type associated +# H5_buildiface.F90 generates all the APIs that have a KIND type associated # with them. -H5_KINDff.F90: H5test_kind$(EXEEXT) - $(RUNSERIAL) ./H5test_kind$(EXEEXT) +H5_KINDff.F90: H5_buildiface$(EXEEXT) + $(RUNSERIAL) ./H5_buildiface$(EXEEXT) # Hardcode the dependencies of these files. There isn't a known way of # determining this automagically (like we do with the C files). So, when @@ -1420,7 +1420,7 @@ H5_KINDff.F90: H5test_kind$(EXEEXT) H5f90global.lo: $(srcdir)/H5f90global.F90 H5fortran_types.lo #H5fortran_types.lo: H5fortran_types.F90 #H5fortran_detect.lo: H5fortran_detect.F90 -H5test_kind.lo: $(srcdir)/H5test_kind.F90 +H5_buildiface.lo: $(srcdir)/H5_buildiface.F90 H5_ff.lo: $(srcdir)/H5_ff.F90 H5f90global.lo H5Aff.lo: $(srcdir)/H5Aff.F90 H5f90global.lo H5Dff.lo: $(srcdir)/H5Dff.F90 H5f90global.lo |