[svn-r4165]

Purpose:
    Bug Fixes
Description:
    If the system doesn't support modules, then the F9XMODFLAG would be
    empty. This would cause things like '.' and '../src' to be stranded
    on the compile line by themselves and the compiler would barf.

    Also, there needs to be a dependence between the thyperslab_wr
    program and the THDF5 module.
Solution:
    Put the code to generate the -{M,I,p}<directory> flags in the
    acsite.m4 file since it's not possible to check if a macro is empty
    and do substitution on it in the Makefiles.

    Put a dependency in the Makefile.in so that THDF5 will be made before
    the thyperslab_wr program.
Platforms tested:
    Linux
This commit is contained in:
Bill Wendling
2001-07-09 16:22:08 -05:00
parent fc13ddb7b3
commit bb1d4e704f
6 changed files with 47 additions and 50 deletions

View File

@@ -14,8 +14,6 @@ hdf5_builddir=$(top_builddir)/src
## Add the include directory to the C preprocessor flags the the hdf5 library
## to the library list.
LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir)
MFLAG=@F9XMODFLAG@
FFLAGS=$(MFLAG). $(MFLAG)../src @FFLAGS@
LIBFORTRAN=../src/libhdf5_fortran.la
LIBHDF5=$(hdf5_builddir)/libhdf5.la
@@ -41,6 +39,10 @@ $(TEST_PROGS): $(LIBHDF5) $(LIBH5TEST)
$(TEST_OBJ): $(TEST_HDR)
## Put in dependencies to the THDF5 module so that things will be built
## in the correct order.
thyperslab_wr.lo: thdf5.lo
ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo tcheck.lo ptesthdf5_fortran.lo
@$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo tcheck.lo $(LIBFORTRAN) $(LIBHDF5) $(LIBS)