[svn-r2573] Purpose:

Fix Irix pmake bugs
Description:
	Build fails on Irix when builddir != srcdir
Solution:
	* acconfig.h
	* src/H5config.h.in			[REGENERATED]
		Added definition for HAVE_STREAM

	* config/conclude.in
	* config/depend1.in
	* config/depend2.in
	* config/depend3.in
	* config/depend4.in
		The `Dependencies' file is located in the source
		tree. This fixes bugs for Irix pmake when compiling
		outside the source tree.  Hopefully it still preserves
		Albert's changes which allow concurrent compilations
		to not stomp on each other's Dependencies files.


	* examples/Dependencies			[REGENERATED]
	* src/Dependencies			[REGENERATED]
	* test/Dependencies			[REGENERATED]
	* tools/Dependencies			[REGENERATED]
		Regenerated for testing purposes.
Platforms:
	i686-pc-linux
	mips-sgi-irix6.5
	sparc-sun-solaris2.6
This commit is contained in:
Robb Matzke 2000-09-19 12:04:46 -05:00
parent 7c1e888bde
commit f2caef690b
14 changed files with 1720 additions and 2156 deletions

View File

@ -51,3 +51,6 @@
/* Define if the Grid Storage is defined */
#undef HAVE_GRIDSTORAGE
/* Define if the stream virtual file driver should be compiled */
#undef HAVE_STREAM

View File

@ -6,6 +6,6 @@
# removing all but the base name of other include files (since the Makefiles
# contain the logic for searching).
($h,$_)=/\s*\\/?$h.$`:("","$h\n");
($h,$_)=/\s*\\/?$h.$`:("",$h.$_);
s|( +/\S*)*( *)|$2?" \\\n ":""|eg;
#s|(([-\w\.]+)/)+([-\w\.]+)|\3|g;

View File

@ -61,6 +61,7 @@ LIB_SRC=
LIB_OBJ=
PUB_HDR=
PUB_PROGS=
PUB_DOCS=
PROGS=
TEST_PROGS=
TEST_FLAGS=

View File

@ -179,6 +179,6 @@ maintainer-clean: distclean
## source files and the header files.
##-----------------------------------------------------------------------------
.PHONY: dep depend
dep depend: Dependencies
dep depend: $(srcdir)/Dependencies
@DEPEND@

View File

@ -20,18 +20,16 @@
## otherwise the file is changed and a backup is saved by appending a
## tilde to the file name.
##
.PRECIOUS: Dependencies
Dependencies: .depend
$(srcdir)/Dependencies: .depend
@if test "$(srcdir)" != "."; then \
echo '## This file is machine generated on GNU systems.' \
>$@; \
echo '## Only temporary changes may be made here.' \
>>$@; \
echo >>$@; \
echo '## This file is machine generated on GNU systems.' >$@; \
echo '## Only temporary changes may be made here.' >>$@; \
echo >>$@; \
perl -p $(top_srcdir)/bin/distdep .depend >>$@; \
else \
echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \
fi
.PRECIOUS: .depend
.depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC)
@touch .depend
@for dep in $? dummy; do \
@ -47,14 +45,6 @@ Dependencies: .depend
sed 's/\.o/.lo/' >>$@; \
fi; \
done;
@if test "$(srcdir)" != "."; then \
echo '## This file is machine generated on GNU systems.' \
>Dependencies; \
echo '## Only temporary changes may be made here.' \
>>Dependencies; \
echo >>Dependencies; \
perl -p $(top_srcdir)/bin/distdep .depend>>Dependencies;\
fi
-include .depend

View File

@ -8,4 +8,4 @@
## `.distdep' file from the source tree. This file was automatically generated
## on some system that satisfies the above requirements.
-include Dependencies
-include $(srcdir)/Dependencies

View File

@ -4,4 +4,4 @@
## `.distdep' file from the source tree. This file was automatically generated
## on some system that satisfies the above requirements.
.include <Dependencies>
.include <$(srcdir)/Dependencies>

View File

@ -4,4 +4,4 @@
## `.distdep' file from the source tree. This file was automatically generated
## on some system that satisfies the above requirements.
include Dependencies
include $(srcdir)/Dependencies

View File

@ -31,8 +31,12 @@ h5_chunk_read.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_compound.lo: \
$(srcdir)/h5_compound.c \
$(top_srcdir)/src/hdf5.h \
@ -63,8 +67,12 @@ h5_compound.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_extend_write.lo: \
$(srcdir)/h5_extend_write.c \
$(top_srcdir)/src/hdf5.h \
@ -95,8 +103,12 @@ h5_extend_write.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_group.lo: \
$(srcdir)/h5_group.c \
$(top_srcdir)/src/hdf5.h \
@ -127,8 +139,12 @@ h5_group.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_read.lo: \
$(srcdir)/h5_read.c \
$(top_srcdir)/src/hdf5.h \
@ -159,8 +175,12 @@ h5_read.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_write.lo: \
$(srcdir)/h5_write.c \
$(top_srcdir)/src/hdf5.h \
@ -191,8 +211,12 @@ h5_write.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_select.lo: \
$(srcdir)/h5_select.c \
$(top_srcdir)/src/hdf5.h \
@ -223,8 +247,12 @@ h5_select.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_attribute.lo: \
$(srcdir)/h5_attribute.c \
$(top_srcdir)/src/hdf5.h \
@ -255,8 +283,12 @@ h5_attribute.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_mount.lo: \
$(srcdir)/h5_mount.c \
$(top_srcdir)/src/hdf5.h \
@ -287,8 +319,12 @@ h5_mount.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5_reference.lo: \
$(srcdir)/h5_reference.c \
$(top_srcdir)/src/hdf5.h \
@ -319,5 +355,9 @@ h5_reference.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -86,7 +86,7 @@
/* Define if the Grid Storage is defined */
#undef HAVE_GRIDSTORAGE
/* Define if the Stream VFD is defined */
/* Define if the stream virtual file driver should be compiled */
#undef HAVE_STREAM
/* The number of bytes in a __int64. */

File diff suppressed because it is too large Load Diff

View File

@ -32,46 +32,15 @@ h5tools.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h \
$(top_srcdir)/src/H5private.h \
$(top_builddir)/src/H5config.h
h5findshd.lo: \
$(srcdir)/h5findshd.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/H5RApublic.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/H5FDgass.h \
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5private.h \
$(top_builddir)/src/H5config.h
$(top_builddir)/src/H5config.h \
$(srcdir)/h5dump.h
h5debug.lo: \
$(srcdir)/h5debug.c \
$(top_srcdir)/src/H5private.h \
@ -87,25 +56,29 @@ h5debug.lo: \
$(top_srcdir)/src/H5Fpublic.h \
$(top_srcdir)/src/H5FDpublic.h \
$(top_srcdir)/src/H5MMpublic.h \
$(top_srcdir)/src/H5ACprivate.h \
$(top_srcdir)/src/H5ACpublic.h \
$(top_srcdir)/src/H5Pprivate.h \
$(top_srcdir)/src/H5Ppublic.h \
$(top_srcdir)/src/H5Dpublic.h \
$(top_srcdir)/src/H5Zpublic.h \
$(top_srcdir)/src/H5Dprivate.h \
$(top_srcdir)/src/H5Gprivate.h \
$(top_srcdir)/src/H5Gpublic.h \
$(top_srcdir)/src/H5HGprivate.h \
$(top_srcdir)/src/H5HGpublic.h \
$(top_srcdir)/src/H5HLprivate.h \
$(top_srcdir)/src/H5HLpublic.h \
$(top_srcdir)/src/H5Oprivate.h \
$(top_srcdir)/src/H5Opublic.h \
$(top_srcdir)/src/H5HGprivate.h \
$(top_srcdir)/src/H5HGpublic.h \
$(top_srcdir)/src/H5Tprivate.h \
$(top_srcdir)/src/H5Tpublic.h \
$(top_srcdir)/src/H5Rprivate.h \
$(top_srcdir)/src/H5Rpublic.h \
$(top_srcdir)/src/H5Sprivate.h \
$(top_srcdir)/src/H5Spublic.h \
$(top_srcdir)/src/H5Zprivate.h
$(top_srcdir)/src/H5Zprivate.h \
$(top_srcdir)/src/H5HLprivate.h \
$(top_srcdir)/src/H5HLpublic.h \
$(top_srcdir)/src/H5FDfamily.h
h5import.lo: \
$(srcdir)/h5import.c \
$(top_srcdir)/src/hdf5.h \
@ -136,9 +109,12 @@ h5import.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDmulti.h
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5ls.lo: \
$(srcdir)/h5ls.c \
$(top_srcdir)/src/H5private.h \
@ -172,8 +148,12 @@ h5ls.lo: \
$(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/H5FDdpss.h
$(top_srcdir)/src/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5repart.lo: \
$(srcdir)/h5repart.c \
$(top_srcdir)/src/hdf5.h \
@ -204,9 +184,12 @@ h5repart.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDmulti.h
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h
h5dump.lo: \
$(srcdir)/h5dump.c \
$(srcdir)/h5dump.h \
@ -238,11 +221,15 @@ h5dump.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h \
$(top_srcdir)/src/H5private.h \
$(top_builddir)/src/H5config.h
$(top_builddir)/src/H5config.h \
$(srcdir)/h5tools.h
h5toh4.lo: \
$(srcdir)/h5toh4.c \
$(srcdir)/h5toh4.h \
@ -274,9 +261,13 @@ h5toh4.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDmulti.h
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h \
$(srcdir)/h5tools.h
h5dumptst.lo: \
$(srcdir)/h5dumptst.c \
$(top_srcdir)/src/hdf5.h \
@ -307,9 +298,12 @@ h5dumptst.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h \
$(top_srcdir)/src/H5private.h \
$(top_builddir)/src/H5config.h
pdb2hdf.lo: \
@ -342,6 +336,9 @@ pdb2hdf.lo: \
$(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/H5FDdpss.h \
$(top_srcdir)/src/H5FDmulti.h
$(top_srcdir)/src/H5FDstream.h \
$(top_srcdir)/src/H5FDmulti.h \
$(top_srcdir)/src/H5FDlog.h