diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
commit | 699098014b590a5e39df37d92e7d36139741fd0c (patch) | |
tree | 718ccce06ac3dde4c295e8d325bcc28baf8ed537 /fortran/testpar | |
parent | e59c147f5d647e1fdec51a96fc5ebe8754c2c73f (diff) | |
download | hdf5-699098014b590a5e39df37d92e7d36139741fd0c.zip hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.gz hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.bz2 |
[svn-r20525] Description:
Merge revisions 20475, 20502, and 20504 from trunk to 1.8 branch.
Tested:
Tested on jam, fred, bangan (CYGWIN), and h5committested.
Diffstat (limited to 'fortran/testpar')
-rw-r--r-- | fortran/testpar/Makefile.in | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index b5a1285..f83a758 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -78,14 +78,29 @@ parallel_test_OBJECTS = $(am_parallel_test_OBJECTS) parallel_test_LDADD = $(LDADD) parallel_test_DEPENDENCIES = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) \ $(LIBHDF5) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS) -LTFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) +LTFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) +AM_V_FC = $(am__v_FC_$(V)) +am__v_FC_ = $(am__v_FC_$(AM_DEFAULT_VERBOSITY)) +am__v_FC_0 = @echo " FC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ FCLD = $(FC) -FCLINK = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_FCLD = $(am__v_FCLD_$(V)) +am__v_FCLD_ = $(am__v_FCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_FCLD_0 = @echo " FCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(parallel_test_SOURCES) DIST_SOURCES = $(parallel_test_SOURCES) ETAGS = etags @@ -101,17 +116,20 @@ AMTAR = @AMTAR@ # but which should not be exported to h5cc for building other programs. # AM_CFLAGS is an automake construct which should be used by Makefiles # instead of CFLAGS, as CFLAGS is reserved solely for the user to define. +# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well. AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ # Include files AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/fortran/src \ -I$(top_srcdir)/fortran/test \ $(F9XMODFLAG)$(top_builddir)/fortran/src -AM_LDFLAGS = @AM_LDFLAGS@ $(am__append_1) +AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1) AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ +AS = @AS@ # Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. @@ -171,7 +189,10 @@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ +H5_CXX_SHARED = @H5_CXX_SHARED@ H5_FCFLAGS = @H5_FCFLAGS@ +H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ +H5_LDFLAGS = @H5_LDFLAGS@ H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ @@ -445,7 +466,7 @@ clean-checkPROGRAMS: rm -f $$list parallel_test$(EXEEXT): $(parallel_test_OBJECTS) $(parallel_test_DEPENDENCIES) @rm -f parallel_test$(EXEEXT) - $(FCLINK) $(parallel_test_OBJECTS) $(parallel_test_LDADD) $(LIBS) + $(AM_V_FCLD)$(FCLINK) $(parallel_test_OBJECTS) $(parallel_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -454,12 +475,15 @@ distclean-compile: -rm -f *.tab.c .f90.o: + $(AM_V_FC) @AM_BACKSLASH@ $(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) $< .f90.obj: + $(AM_V_FC) @AM_BACKSLASH@ $(FCCOMPILE) -c -o $@ $(FCFLAGS_f90) `$(CYGPATH_W) '$<'` .f90.lo: + $(AM_V_FC) @AM_BACKSLASH@ $(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $< mostlyclean-libtool: |