From c390d06017bb7700f116b4d7523d586f5f9e6a9a Mon Sep 17 00:00:00 2001
From: Bill Wendling <wendling@ncsa.uiuc.edu>
Date: Thu, 8 May 2003 18:19:15 -0500
Subject: [svn-r6842] Purpose:     Code Cleanup

Description:
    Warning messages were being produced by the "make" program because
    the "docdir" was being specified twice as a target in the generated
    Makefiles. This is because the "EXAMPLESDIR" was also defined as
    "docdir".

Solution:
    Made "EXAMPLESDIR" unique for C, Fortran, and C++ in the commence.in
    file and removed EXAMPLESDIR from the Makefile.ins

Platforms tested:
    Dangermouse (only affects make system, not code).

Misc. update:
---
 c++/config/commence.in       | 2 +-
 c++/examples/Makefile.in     | 2 --
 config/commence.in           | 2 +-
 examples/Makefile.in         | 2 --
 fortran/config/commence.in   | 2 +-
 fortran/examples/Makefile.in | 2 --
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/c++/config/commence.in b/c++/config/commence.in
index 8efa81b..8f63096 100644
--- a/c++/config/commence.in
+++ b/c++/config/commence.in
@@ -61,7 +61,7 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 ## complains if it sees a reference to a variable which has never been
 ## defined. The main makefile is free to redefine these to something else.
 DOCDIR=$(docdir)
-EXAMPLEDIR=$(docdir)
+EXAMPLEDIR=$(docdir)/hdf5/examples/c++
 LIB=
 LIB_SRC=
 LIB_OBJ=
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 3c872b6..8c08e2e 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -21,8 +21,6 @@ srcdir=@srcdir@
 
 @COMMENCE@
 
-EXAMPLEDIR=$(docdir)/hdf5/examples/c++
-
 hdf5_srcdir=$(top_srcdir)/src
 hdf5_builddir=$(top_builddir)/src
 
diff --git a/config/commence.in b/config/commence.in
index f6a27d0..0cdfce1 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -59,7 +59,7 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 ## defined. The main makefile is free to redefine these to something else.
 DOCDIR=$(docdir)
 SUBDOCDIR=
-EXAMPLEDIR=$(docdir)
+EXAMPLEDIR=$(docdir)/hdf5/examples/c
 LIB=
 LIB_SRC=
 LIB_OBJ=
diff --git a/examples/Makefile.in b/examples/Makefile.in
index b9bd4ba..7e9a0c1 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -17,8 +17,6 @@ top_builddir=..
 srcdir=@srcdir@
 @COMMENCE@
 
-EXAMPLEDIR=$(docdir)/hdf5/examples/c
-
 ## Replace building CC with the just installed h5cc
 CC=$(bindir)/h5cc
 CPPFLAGS=-I. -I$(srcdir)
diff --git a/fortran/config/commence.in b/fortran/config/commence.in
index 5a05221..6abbfc5 100644
--- a/fortran/config/commence.in
+++ b/fortran/config/commence.in
@@ -69,7 +69,7 @@ LT_LINK_FEXE=$(LT) --mode=link $(F9X) $(LT_STATIC_EXEC) $(DYNAMIC_DIRS)
 ## complains if it sees a reference to a variable which has never been
 ## defined. The main makefile is free to redefine these to something else.
 DOCDIR=$(docdir)
-EXAMPLEDIR=$(docdir)
+EXAMPLEDIR=$(docdir)/hdf5/examples/fortran
 LIB=
 LIB_SRC=
 LIB_OBJ=
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index cc58f15..601d51a 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -17,8 +17,6 @@ top_builddir=../..
 srcdir=@srcdir@
 @COMMENCE@
 
-EXAMPLEDIR=$(docdir)/hdf5/examples/fortran
-
 hdf5_builddir=$(top_builddir)/src
 
 ## Replace building FC with the just installed h5fc
-- 
cgit v0.12