diff options
| author | Robb Matzke <matzke@llnl.gov> | 2000-09-19 17:04:46 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 2000-09-19 17:04:46 (GMT) |
| commit | f2caef690b3bdb99b27ff38a3ed1676300e5cd9d (patch) | |
| tree | 050fc6413bc7590d681f8ce32ff3301864a38d37 /config | |
| parent | 7c1e888bde6c2c3c345f37022099e1f294267f3c (diff) | |
| download | hdf5-f2caef690b3bdb99b27ff38a3ed1676300e5cd9d.zip hdf5-f2caef690b3bdb99b27ff38a3ed1676300e5cd9d.tar.gz hdf5-f2caef690b3bdb99b27ff38a3ed1676300e5cd9d.tar.bz2 | |
[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
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/conclude.in | 2 | ||||
| -rw-r--r-- | config/depend1.in | 22 | ||||
| -rw-r--r-- | config/depend2.in | 2 | ||||
| -rw-r--r-- | config/depend3.in | 2 | ||||
| -rw-r--r-- | config/depend4.in | 2 |
6 files changed, 11 insertions, 20 deletions
diff --git a/config/commence.in b/config/commence.in index 461d322..04f4446 100644 --- a/config/commence.in +++ b/config/commence.in @@ -61,6 +61,7 @@ LIB_SRC= LIB_OBJ= PUB_HDR= PUB_PROGS= +PUB_DOCS= PROGS= TEST_PROGS= TEST_FLAGS= diff --git a/config/conclude.in b/config/conclude.in index bba94a1..ea2333f 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -179,6 +179,6 @@ maintainer-clean: distclean ## source files and the header files. ##----------------------------------------------------------------------------- .PHONY: dep depend -dep depend: Dependencies +dep depend: $(srcdir)/Dependencies @DEPEND@ diff --git a/config/depend1.in b/config/depend1.in index 4a24846..e07f4bf 100644 --- a/config/depend1.in +++ b/config/depend1.in @@ -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 diff --git a/config/depend2.in b/config/depend2.in index ae49989..f67914f 100644 --- a/config/depend2.in +++ b/config/depend2.in @@ -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 diff --git a/config/depend3.in b/config/depend3.in index 26056d2..e856bc5 100644 --- a/config/depend3.in +++ b/config/depend3.in @@ -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> diff --git a/config/depend4.in b/config/depend4.in index 84e0f53..b0324d9 100644 --- a/config/depend4.in +++ b/config/depend4.in @@ -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 |