[svn-r11570] Purpose:

Appearance change.

Description:
depend1.in:
Change the style of the copyright generation commands to a simplier
style.
Dependencies:
Regenerated the Dependencies file.

Platforms tested:
Tested in heping in serial and parallel modes.

26 files changed, 686 insertions, 913 deletions

diff --git a/c++/config/depend1.in b/c++/config/depend1.in
index dabf597..d2cf99f 100644
--- a/c++/config/depend1.in
+++ b/c++/config/depend1.in
@@ -22,22 +22,24 @@
 ##
 $(srcdir)/Dependencies: .depend
 	@if test "$(srcdir)" != "."; then					\
-	  echo '##' >$@; \
-	  echo '## Copyright by the Board of Trustees of the University of Illinois.' >>$@; \
-	  echo '## All rights reserved.' >>$@; \
-	  echo '##' >>$@; \
-	  echo '## This file is part of HDF5.  The full HDF5 copyright notice, including' >>$@; \
-	  echo '## terms governing use, modification, and redistribution, is contained in' >>$@; \
-	  echo '## the files COPYING and Copyright.html.  COPYING can be found at the root' >>$@; \
-	  echo '## of the source code distribution tree; Copyright.html can be found at the' >>$@; \
-	  echo '## root level of an installed copy of the electronic HDF5 document set and' >>$@; \
-	  echo '## is linked from the top-level documents page.  It can also be found at' >>$@; \
-	  echo '## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have' >>$@; \
-	  echo '## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.' >>$@; \
-	  echo '##' >>$@; \
-	  echo '## This file is machine generated on GNU systems.' >>$@;		\
-	  echo '## Only temporary changes may be made here.' >>$@;		\
-	  echo >>$@;								\
+	  (									\
+	    echo '##'; 								\
+	    echo '## This file is machine generated on GNU systems.';		\
+	    echo '## Only temporary changes may be made here.';			\
+	    echo '##'; 								\
+	    echo '## Copyright by the Board of Trustees of the University of Illinois.'; \
+	    echo '## All rights reserved.'; 					\
+	    echo '##'; 								\
+	    echo '## This file is part of HDF5.  The full HDF5 copyright notice, including'; \
+	    echo '## terms governing use, modification, and redistribution, is contained in'; \
+	    echo '## the files COPYING and Copyright.html.  COPYING can be found at the root'; \
+	    echo '## of the source code distribution tree; Copyright.html can be found at the'; \
+	    echo '## root level of an installed copy of the electronic HDF5 document set and'; \
+	    echo '## is linked from the top-level documents page.  It can also be found at'; \
+	    echo '## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have'; \
+	    echo '## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.'; \
+	    echo;								\
+	  ) >$@;								\
 	  $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@;			\
 	else									\
 	  echo 'Dependencies cannot be built when $$srcdir == $$builddir';	\
diff --git a/c++/examples/Dependencies b/c++/examples/Dependencies
index f29a269..def8825 100644
--- a/c++/examples/Dependencies
+++ b/c++/examples/Dependencies
@@ -1,3 +1,16 @@
+##
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
+##
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 
diff --git a/c++/src/Dependencies b/c++/src/Dependencies
index 5fdbca9..def8825 100644
--- a/c++/src/Dependencies
+++ b/c++/src/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,7 +13,4 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
diff --git a/c++/test/Dependencies b/c++/test/Dependencies
index 5fdbca9..def8825 100644
--- a/c++/test/Dependencies
+++ b/c++/test/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,7 +13,4 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
diff --git a/config/depend1.in b/config/depend1.in
index dabf597..d2cf99f 100644
--- a/config/depend1.in
+++ b/config/depend1.in
@@ -22,22 +22,24 @@
 ##
 $(srcdir)/Dependencies: .depend
 	@if test "$(srcdir)" != "."; then					\
-	  echo '##' >$@; \
-	  echo '## Copyright by the Board of Trustees of the University of Illinois.' >>$@; \
-	  echo '## All rights reserved.' >>$@; \
-	  echo '##' >>$@; \
-	  echo '## This file is part of HDF5.  The full HDF5 copyright notice, including' >>$@; \
-	  echo '## terms governing use, modification, and redistribution, is contained in' >>$@; \
-	  echo '## the files COPYING and Copyright.html.  COPYING can be found at the root' >>$@; \
-	  echo '## of the source code distribution tree; Copyright.html can be found at the' >>$@; \
-	  echo '## root level of an installed copy of the electronic HDF5 document set and' >>$@; \
-	  echo '## is linked from the top-level documents page.  It can also be found at' >>$@; \
-	  echo '## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have' >>$@; \
-	  echo '## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.' >>$@; \
-	  echo '##' >>$@; \
-	  echo '## This file is machine generated on GNU systems.' >>$@;		\
-	  echo '## Only temporary changes may be made here.' >>$@;		\
-	  echo >>$@;								\
+	  (									\
+	    echo '##'; 								\
+	    echo '## This file is machine generated on GNU systems.';		\
+	    echo '## Only temporary changes may be made here.';			\
+	    echo '##'; 								\
+	    echo '## Copyright by the Board of Trustees of the University of Illinois.'; \
+	    echo '## All rights reserved.'; 					\
+	    echo '##'; 								\
+	    echo '## This file is part of HDF5.  The full HDF5 copyright notice, including'; \
+	    echo '## terms governing use, modification, and redistribution, is contained in'; \
+	    echo '## the files COPYING and Copyright.html.  COPYING can be found at the root'; \
+	    echo '## of the source code distribution tree; Copyright.html can be found at the'; \
+	    echo '## root level of an installed copy of the electronic HDF5 document set and'; \
+	    echo '## is linked from the top-level documents page.  It can also be found at'; \
+	    echo '## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have'; \
+	    echo '## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.'; \
+	    echo;								\
+	  ) >$@;								\
 	  $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@;			\
 	else									\
 	  echo 'Dependencies cannot be built when $$srcdir == $$builddir';	\
diff --git a/examples/Dependencies b/examples/Dependencies
index dfd1419..20757c8 100644
--- a/examples/Dependencies
+++ b/examples/Dependencies
@@ -1,379 +1,52 @@
+##
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
+##
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 
 h5_chunk_read.lo: \
    $(srcdir)/h5_chunk_read.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_compound.lo: \
    $(srcdir)/h5_compound.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_extend_write.lo: \
    $(srcdir)/h5_extend_write.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_group.lo: \
    $(srcdir)/h5_group.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_read.lo: \
    $(srcdir)/h5_read.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_write.lo: \
    $(srcdir)/h5_write.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_select.lo: \
    $(srcdir)/h5_select.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_attribute.lo: \
    $(srcdir)/h5_attribute.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_mount.lo: \
    $(srcdir)/h5_mount.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_reference.lo: \
    $(srcdir)/h5_reference.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 h5_drivers.lo: \
    $(srcdir)/h5_drivers.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
+   hdf5.h
 ph5example.lo: \
-   $(srcdir)/ph5example.c
+   $(srcdir)/ph5example.c \
+   hdf5.h
diff --git a/fortran/config/depend1.in b/fortran/config/depend1.in
index dabf597..d2cf99f 100644
--- a/fortran/config/depend1.in
+++ b/fortran/config/depend1.in
@@ -22,22 +22,24 @@
 ##
 $(srcdir)/Dependencies: .depend
 	@if test "$(srcdir)" != "."; then					\
-	  echo '##' >$@; \
-	  echo '## Copyright by the Board of Trustees of the University of Illinois.' >>$@; \
-	  echo '## All rights reserved.' >>$@; \
-	  echo '##' >>$@; \
-	  echo '## This file is part of HDF5.  The full HDF5 copyright notice, including' >>$@; \
-	  echo '## terms governing use, modification, and redistribution, is contained in' >>$@; \
-	  echo '## the files COPYING and Copyright.html.  COPYING can be found at the root' >>$@; \
-	  echo '## of the source code distribution tree; Copyright.html can be found at the' >>$@; \
-	  echo '## root level of an installed copy of the electronic HDF5 document set and' >>$@; \
-	  echo '## is linked from the top-level documents page.  It can also be found at' >>$@; \
-	  echo '## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have' >>$@; \
-	  echo '## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.' >>$@; \
-	  echo '##' >>$@; \
-	  echo '## This file is machine generated on GNU systems.' >>$@;		\
-	  echo '## Only temporary changes may be made here.' >>$@;		\
-	  echo >>$@;								\
+	  (									\
+	    echo '##'; 								\
+	    echo '## This file is machine generated on GNU systems.';		\
+	    echo '## Only temporary changes may be made here.';			\
+	    echo '##'; 								\
+	    echo '## Copyright by the Board of Trustees of the University of Illinois.'; \
+	    echo '## All rights reserved.'; 					\
+	    echo '##'; 								\
+	    echo '## This file is part of HDF5.  The full HDF5 copyright notice, including'; \
+	    echo '## terms governing use, modification, and redistribution, is contained in'; \
+	    echo '## the files COPYING and Copyright.html.  COPYING can be found at the root'; \
+	    echo '## of the source code distribution tree; Copyright.html can be found at the'; \
+	    echo '## root level of an installed copy of the electronic HDF5 document set and'; \
+	    echo '## is linked from the top-level documents page.  It can also be found at'; \
+	    echo '## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have'; \
+	    echo '## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.'; \
+	    echo;								\
+	  ) >$@;								\
 	  $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@;			\
 	else									\
 	  echo 'Dependencies cannot be built when $$srcdir == $$builddir';	\
diff --git a/fortran/examples/Dependencies b/fortran/examples/Dependencies
index f29a269..def8825 100644
--- a/fortran/examples/Dependencies
+++ b/fortran/examples/Dependencies
@@ -1,3 +1,16 @@
+##
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
+##
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 
diff --git a/fortran/src/Dependencies b/fortran/src/Dependencies
index f979a77..79ed2a8 100644
--- a/fortran/src/Dependencies
+++ b/fortran/src/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,543 +13,582 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 H5f90kit.lo: \
    $(srcdir)/H5f90kit.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5_f.lo: \
    $(srcdir)/H5_f.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Rf.lo: \
    $(srcdir)/H5Rf.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Ff.lo: \
    $(srcdir)/H5Ff.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h \
-   $(top_srcdir)/src/H5Eprivate.h
+   $(top_srcdir)/fortran/../src/H5Eprivate.h
 H5Sf.lo: \
    $(srcdir)/H5Sf.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Df.lo: \
    $(srcdir)/H5Df.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Gf.lo: \
    $(srcdir)/H5Gf.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Af.lo: \
    $(srcdir)/H5Af.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h \
-   $(top_srcdir)/src/H5Eprivate.h
+   $(top_srcdir)/fortran/../src/H5Eprivate.h
 H5Tf.lo: \
    $(srcdir)/H5Tf.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Pf.lo: \
    $(srcdir)/H5Pf.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5If.lo: \
    $(srcdir)/H5If.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h \
-   $(top_srcdir)/src/H5Eprivate.h
+   $(top_srcdir)/fortran/../src/H5Eprivate.h
 H5Ef.lo: \
    $(srcdir)/H5Ef.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
 H5Zf.lo: \
    $(srcdir)/H5Zf.c \
    $(srcdir)/H5f90.h \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
    $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDlog.h \
-   $(top_srcdir)/src/H5FDmpi.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDmpiposix.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
    $(srcdir)/H5f90i.h \
-   $(top_srcdir)/src/H5private.h \
-   $(top_srcdir)/src/H5MPprivate.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
    $(srcdir)/H5f90proto.h
+H5FDmpiof.lo: \
+   $(srcdir)/H5FDmpiof.c \
+   $(srcdir)/H5f90.h \
+   $(top_srcdir)/fortran/../src/hdf5.h \
+   $(top_srcdir)/fortran/../src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_srcdir)/fortran/../src/H5api_adpt.h \
+   $(top_srcdir)/fortran/../src/H5Apublic.h \
+   $(top_srcdir)/fortran/../src/H5Ipublic.h \
+   $(top_srcdir)/fortran/../src/H5ACpublic.h \
+   $(top_srcdir)/fortran/../src/H5Bpublic.h \
+   $(top_srcdir)/fortran/../src/H5Dpublic.h \
+   $(top_srcdir)/fortran/../src/H5Epublic.h \
+   $(top_srcdir)/fortran/../src/H5Fpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDpublic.h \
+   $(top_srcdir)/fortran/../src/H5Gpublic.h \
+   $(top_srcdir)/fortran/../src/H5Opublic.h \
+   $(top_srcdir)/fortran/../src/H5HGpublic.h \
+   $(top_srcdir)/fortran/../src/H5HLpublic.h \
+   $(top_srcdir)/fortran/../src/H5MMpublic.h \
+   $(top_srcdir)/fortran/../src/H5Ppublic.h \
+   $(top_srcdir)/fortran/../src/H5Zpublic.h \
+   $(top_srcdir)/fortran/../src/H5Rpublic.h \
+   $(top_srcdir)/fortran/../src/H5Spublic.h \
+   $(top_srcdir)/fortran/../src/H5Tpublic.h \
+   $(top_srcdir)/fortran/../src/H5FDcore.h \
+   $(top_srcdir)/fortran/../src/H5FDfamily.h \
+   $(top_srcdir)/fortran/../src/H5FDgass.h \
+   $(top_srcdir)/fortran/../src/H5FDlog.h \
+   $(top_srcdir)/fortran/../src/H5FDmpi.h \
+   $(top_srcdir)/fortran/../src/H5FDmpio.h \
+   $(top_srcdir)/fortran/../src/H5FDmpiposix.h \
+   $(top_srcdir)/fortran/../src/H5FDmulti.h \
+   $(top_srcdir)/fortran/../src/H5FDsec2.h \
+   $(top_srcdir)/fortran/../src/H5FDsrb.h \
+   $(top_srcdir)/fortran/../src/H5FDstdio.h \
+   $(top_srcdir)/fortran/../src/H5FDstream.h \
+   $(srcdir)/H5f90i.h \
+   $(top_srcdir)/fortran/../src/H5private.h \
+   $(top_srcdir)/fortran/../src/H5MPprivate.h \
+   $(srcdir)/H5f90proto.h \
+   ./H5pubconf_fortran.h
diff --git a/fortran/test/Dependencies b/fortran/test/Dependencies
index 5fdbca9..def8825 100644
--- a/fortran/test/Dependencies
+++ b/fortran/test/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,7 +13,4 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
diff --git a/fortran/testpar/Dependencies b/fortran/testpar/Dependencies
index f29a269..def8825 100644
--- a/fortran/testpar/Dependencies
+++ b/fortran/testpar/Dependencies
@@ -1,3 +1,16 @@
+##
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
+##
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 
diff --git a/hl/src/Dependencies b/hl/src/Dependencies
index 9daee69..da99d80 100644
--- a/hl/src/Dependencies
+++ b/hl/src/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 H5LT.lo: \
    $(srcdir)/H5LT.c \
diff --git a/hl/test/Dependencies b/hl/test/Dependencies
index e59e0ad..c051435 100644
--- a/hl/test/Dependencies
+++ b/hl/test/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 test_lite.lo: \
    $(srcdir)/test_lite.c \
diff --git a/perform/Dependencies b/perform/Dependencies
index a551914..b71a7d9 100644
--- a/perform/Dependencies
+++ b/perform/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 iopipe.lo: \
    $(srcdir)/iopipe.c \
diff --git a/src/Dependencies b/src/Dependencies
index 672bc05..615f614 100644
--- a/src/Dependencies
+++ b/src/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 H5.lo: \
    $(srcdir)/H5.c \
diff --git a/test/Dependencies b/test/Dependencies
index 17cd345..4bb3185 100644
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5test.lo: \
    $(srcdir)/h5test.c \
diff --git a/testpar/Dependencies b/testpar/Dependencies
index b2def81..beb9878 100644
--- a/testpar/Dependencies
+++ b/testpar/Dependencies
@@ -1,5 +1,18 @@
+##
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
+##
+## Copyright by the Board of Trustees of the University of Illinois.
+## All rights reserved.
+##
+## This file is part of HDF5.  The full HDF5 copyright notice, including
+## terms governing use, modification, and redistribution, is contained in
+## the files COPYING and Copyright.html.  COPYING can be found at the root
+## of the source code distribution tree; Copyright.html can be found at the
+## root level of an installed copy of the electronic HDF5 document set and
+## is linked from the top-level documents page.  It can also be found at
+## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 
 t_mpi.lo: \
    $(srcdir)/t_mpi.c \
diff --git a/tools/gifconv/Dependencies b/tools/gifconv/Dependencies
index 82ee8b5..3b31efd 100644
--- a/tools/gifconv/Dependencies
+++ b/tools/gifconv/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 decompress.lo: \
    $(srcdir)/decompress.c \
diff --git a/tools/h5diff/Dependencies b/tools/h5diff/Dependencies
index 7121d57..c9277c0 100644
--- a/tools/h5diff/Dependencies
+++ b/tools/h5diff/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5diff_main.lo: \
    $(srcdir)/h5diff_main.c \
diff --git a/tools/h5dump/Dependencies b/tools/h5dump/Dependencies
index 8b1ae92..9013c5e 100644
--- a/tools/h5dump/Dependencies
+++ b/tools/h5dump/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5dump.lo: \
    $(srcdir)/h5dump.c \
diff --git a/tools/h5import/Dependencies b/tools/h5import/Dependencies
index cc49b9d..b1df5e3 100644
--- a/tools/h5import/Dependencies
+++ b/tools/h5import/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5import.lo: \
    $(srcdir)/h5import.c \
diff --git a/tools/h5jam/Dependencies b/tools/h5jam/Dependencies
index ab46cb0..e005a47 100644
--- a/tools/h5jam/Dependencies
+++ b/tools/h5jam/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5jam.lo: \
    $(srcdir)/h5jam.c \
diff --git a/tools/h5ls/Dependencies b/tools/h5ls/Dependencies
index 0a6c192..01cf75f 100644
--- a/tools/h5ls/Dependencies
+++ b/tools/h5ls/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5ls.lo: \
    $(srcdir)/h5ls.c \
diff --git a/tools/h5repack/Dependencies b/tools/h5repack/Dependencies
index fc6dcba..c89f0b6 100644
--- a/tools/h5repack/Dependencies
+++ b/tools/h5repack/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5repack.lo: \
    $(srcdir)/h5repack.c \
diff --git a/tools/lib/Dependencies b/tools/lib/Dependencies
index 43894f0..dc32002 100644
--- a/tools/lib/Dependencies
+++ b/tools/lib/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5tools.lo: \
    $(srcdir)/h5tools.c \
diff --git a/tools/misc/Dependencies b/tools/misc/Dependencies
index 47346e7..0ab9bee 100644
--- a/tools/misc/Dependencies
+++ b/tools/misc/Dependencies
@@ -1,4 +1,7 @@
 ##
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -10,9 +13,6 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
-## This file is machine generated on GNU systems.
-## Only temporary changes may be made here.
 
 h5debug.lo: \
    $(srcdir)/h5debug.c \