From 6a259df23d0b5743220324b2f655fd0088d01879 Mon Sep 17 00:00:00 2001 From: James Laird Date: Tue, 7 Jun 2005 16:17:46 -0500 Subject: [svn-r10870] Purpose: Bug fix Description: Fortran type detection failed on Cygwin. This is because executables in Cygwin have the .exe extension, which confused dependencies in the Makefile. Solution: Sprinkled the $(EXEEXT) variable liberally about the fortran/src Makefile.am. This variable is set at configure time and will be ".exe" on Cygwin and stay "" on Linux. Platforms tested: Cygwin, modi4, mir --- fortran/src/Makefile.am | 8 ++++---- fortran/src/Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index da4549c..14a1c11 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -121,13 +121,13 @@ BUILT_SOURCES = H5f90i_gen.h # it needs to run H5match_types. H5fortran_types.f90 H5f90i_gen.h: H5match_types.c $(MAKE) $(AM_MAKEFLAGS) H5fort_type_defines.h - $(MAKE) $(AM_MAKEFLAGS) H5match_types - $(RUNSERIAL) ./H5match_types + $(MAKE) $(AM_MAKEFLAGS) H5match_types$(EXEEXT) + $(RUNSERIAL) ./H5match_types$(EXEEXT) # H5fort_type_defines.h is created by running H5fortran_detect. # Obviously, H5fortran_detect needs to be built first. -H5fort_type_defines.h: H5fortran_detect - $(RUNSERIAL) ./H5fortran_detect > H5fort_type_defines.h +H5fort_type_defines.h: H5fortran_detect$(EXEEXT) + $(RUNSERIAL) ./H5fortran_detect$(EXEEXT) > H5fort_type_defines.h # Automake knows how to build fortran programs if we tell it the source # files. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 330d3d3..4c90810 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -781,13 +781,13 @@ install-exec-local: # it needs to run H5match_types. H5fortran_types.f90 H5f90i_gen.h: H5match_types.c $(MAKE) $(AM_MAKEFLAGS) H5fort_type_defines.h - $(MAKE) $(AM_MAKEFLAGS) H5match_types - $(RUNSERIAL) ./H5match_types + $(MAKE) $(AM_MAKEFLAGS) H5match_types$(EXEEXT) + $(RUNSERIAL) ./H5match_types$(EXEEXT) # H5fort_type_defines.h is created by running H5fortran_detect. # Obviously, H5fortran_detect needs to be built first. -H5fort_type_defines.h: H5fortran_detect - $(RUNSERIAL) ./H5fortran_detect > H5fort_type_defines.h +H5fort_type_defines.h: H5fortran_detect$(EXEEXT) + $(RUNSERIAL) ./H5fortran_detect$(EXEEXT) > H5fort_type_defines.h # 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 -- cgit v0.12