diff options
author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
---|---|---|
committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
commit | 0603e2db00e773702906387620e5644c23360703 (patch) | |
tree | a3f999ab9a8ac0ae015fedb9eb45a709a99c4a85 /config/depend1.in | |
parent | 6e0e3da2837214179812cf613e78227d4cbb78b3 (diff) | |
download | hdf5-0603e2db00e773702906387620e5644c23360703.zip hdf5-0603e2db00e773702906387620e5644c23360703.tar.gz hdf5-0603e2db00e773702906387620e5644c23360703.tar.bz2 |
[svn-r7269] Purpose:
Update
Description:
Revamped the configuration system. The configurations for the Fortran
and C++ libraries are no longer separate from the "main"
configuration system. This involved removing the "configure*" and
"aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
merging settings in the config/ subdirectories into the main config/
subdirectory.
Fortran header files had to be modified a little for Linux. It was
checking if it was a Linux machine by some #defines, however with the
-std=c99 switch, these defines weren't there. I added a check for
some other ones which should be there whether the -std=c99 switch is
used or not.
Platforms tested:
Verbena (Fortran & C++)
Sol (Fortran & C++)
Copper (Fortran & C++)
Modi4 (Parallel, Fortran, & C++)
Misc. update:
Diffstat (limited to 'config/depend1.in')
-rw-r--r-- | config/depend1.in | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/config/depend1.in b/config/depend1.in index eaa7488..c34720a 100644 --- a/config/depend1.in +++ b/config/depend1.in @@ -21,31 +21,39 @@ ## 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 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 + @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) $@; \ + ;; \ + *.cpp) \ + echo Building dependencies for $$dep; \ + obj=`basename $$dep .cpp`.lo; \ + sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ + $(TRACE) $$dep; \ + $(CXX) -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 |