diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-08-01 21:16:47 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-08-01 21:16:47 (GMT) |
| commit | 90ab7aaaff53cd3ec87bf578e9c562f88219a965 (patch) | |
| tree | b999b15aacce93f1185920e128dae5cfc9e5ecbc /config | |
| parent | 40e63a9a7ce91a92254fec337fb7e1dbb32cfee0 (diff) | |
| download | hdf5-90ab7aaaff53cd3ec87bf578e9c562f88219a965.zip hdf5-90ab7aaaff53cd3ec87bf578e9c562f88219a965.tar.gz hdf5-90ab7aaaff53cd3ec87bf578e9c562f88219a965.tar.bz2 | |
[svn-r4295]
Purpose:
Back-port of Bug Fix
Description:
Back port from the 1.5 branch of the .depend/Dependencies files
generation bug. (When the $srcdir et.al. macros began with a ".",
they were lopping off the first character of a header file's path).
Platforms tested:
Linux
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/depend1.in | 48 |
2 files changed, 24 insertions, 25 deletions
diff --git a/config/commence.in b/config/commence.in index 37f8131..a05f9ed 100644 --- a/config/commence.in +++ b/config/commence.in @@ -22,6 +22,7 @@ ROOT=@ROOT@ LIBS=@LIBS@ AR=@AR@ RANLIB=@RANLIB@ +PERL=@PERL@ RM=rm -f CP=cp INSTALL=@INSTALL@ diff --git a/config/depend1.in b/config/depend1.in index ad5b79f..eaa7488 100644 --- a/config/depend1.in +++ b/config/depend1.in @@ -21,33 +21,31 @@ ## tilde to the file name. ## $(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 >>$@; \ - perl -p $(top_srcdir)/bin/distdep .depend >>$@; \ - else \ - echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ - fi + @if test "$(srcdir)" != "."; then \ + 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 .depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC) @touch .depend - @for dep in $? dummy; do \ - if [ $$dep != "dummy" ]; then \ - case "$$dep" in \ - *.c) \ - echo Building dependencies for $$dep; \ - obj=`basename $$dep .c`.lo; \ - sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(TRACE) $$dep; \ - $(CC) -MM -MG $(CPPFLAGS) $$dep 2>/dev/null | \ - sed 's% $(srcdir)/% $$(srcdir)/%g' | \ - sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ - sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ - sed 's/\.o/.lo/' >>$@; \ - ;; \ - esac; \ - fi; \ - done; + @for dep in $? dummy; do \ + if test $$dep != "dummy" -a -n "$(PERL)"; then \ + case "$$dep" in \ + *.c) \ + echo Building dependencies for $$dep; \ + obj=`basename $$dep .c`.lo; \ + sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ + $(TRACE) $$dep; \ + $(CC) -MM -MG $(CPPFLAGS) $$dep 2>/dev/null >>$@; \ + $(PERL) -w $(top_srcdir)/bin/dependencies --srcdir=$(srcdir) --top_srcdir=$(top_srcdir) --top_builddir=$(top_builddir) $@; \ + ;; \ + esac; \ + fi; \ + done -include .depend + |