From 6c41212cc497302b91c0376eeee850d9eb8ff531 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 30 Jun 2003 11:26:46 -0500 Subject: [svn-r7123] Purpose: Bug Fix Description: The SUBDIRS macro is now defined as "" in the config/commence.in file. We shouldn't have definitions of this macro before the inclusion of config/commence.in. Solution: Placed all definitions of SUBDIRS after config/commence.in inclusion. Platforms tested: Modi4 (Small fix yet again). Misc. update: --- hl/tools/gif2h5/Makefile.in | 1 - tools/Makefile.in | 3 +-- tools/gifconv/Makefile.in | 1 - tools/h5diff/Makefile.in | 1 - tools/h5dump/Makefile.in | 1 - tools/h5import/Makefile.in | 1 - tools/h5ls/Makefile.in | 1 - tools/lib/Makefile.in | 1 - tools/misc/Makefile.in | 1 - 9 files changed, 1 insertion(+), 10 deletions(-) diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 9522cd0..1c5fd3c 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -15,7 +15,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/Makefile.in b/tools/Makefile.in index ae0ab44..b9388e9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,13 +15,12 @@ top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ +@COMMENCE@ ## All subdirectories except for the ``lib'' subdirectory. ## SUBDIRS=h5dump h5diff h5ls misc gifconv h5import -@COMMENCE@ - ## Add include directory to the C preprocessor flags, add -lh5tools and ## -lhdf5 to the list of libraries. ## diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 9522cd0..1c5fd3c 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -15,7 +15,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 28dace9..bfef2c2 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -15,7 +15,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 231111e..766d00b 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -15,7 +15,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 7a55f53..73d4f13 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -16,7 +16,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 5f32396..0ecf657 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -15,7 +15,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 594c9c4..b6b979e 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -15,7 +15,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index dad2de9..9e98a73 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -16,7 +16,6 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ -SUBDIRS= @COMMENCE@ ## Add include directory to the C preprocessor flags, add -lh5tools and -- cgit v0.12