From 86fdcb0d1bb40fac9a82f51d564891137d95ae97 Mon Sep 17 00:00:00 2001
From: Binh-Minh Ribler <bmribler@hdfgroup.org>
Date: Mon, 21 Jan 2002 22:42:27 -0500
Subject: [svn-r4846] Purpose:     Added platform support

Description:
    The current libtool doesn't fully support C++ yet, so until it
    does, the default libraries have to be manually specify.
    Some minor cleanups needed.

Solution:
    Added DEFAULT_LIBS=@DEFAULT_LIBS@ to use new macro for default library
    Added $(DEFAULT_LIBS) to link lines

    Removed inappropriate comments, and this extra set, it occurs twice:

## These are our main targets. They should be listed in the order to be
## executed, generally most specific tests to least specific tests.
RUNTEST=$(LT_RUN)

    although I'm not sure if it even should be there, so I should leave
    it for Bill.

Platforms tested:
    IRIX64 (modi4)
    I'll check out again to make sure I haven't broken anything else.
---
 c++/test/Makefile.in | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 3be7a91..89aca68 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -12,20 +12,21 @@ srcdir=@srcdir@
 hdf5_srcdir=$(top_srcdir)/src
 hdf5_builddir=$(top_builddir)/src
 
-## Add include directory to the C preprocessor flags and the h5test and hdf5
-## libraries to the library list.
-CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(top_srcdir)/test -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
+## Obtain default library; the current version of libtool does not fully
+## support C++ yet, and it does not know which default library to find. 
+## With libtool 1.5, this support can be removed.  - BMR - Jan, 2002
+DEFAULT_LIBS=@DEFAULT_LIBS@
 
-## These are our main targets. They should be listed in the order to be
-## executed, generally most specific tests to least specific tests.
-RUNTEST=$(LT_RUN)
+## Add include directory to the cpp preprocessor flags; note that the
+## hdf5/test directory is needed for the use of h5test
+CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(top_srcdir)/test -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
 
-## Add include directory to the C preprocessor flags and the h5test and hdf5
-## libraries to the library list.
-LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir)
+## Add the C++ API library and the hdf5 library to the library lists
 LIB=../src/libhdf5_cpp.la
 LIBHDF5=$(hdf5_builddir)/libhdf5.la
 
+LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir)
+
 ## These are our main targets. They should be listed in the order to be
 ## executed, generally most specific tests to least specific tests.
 RUNTEST=$(LT_RUN)
@@ -43,9 +44,9 @@ DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o)
 $(TEST_PROGS): $(LIB) $(LIBHDF5)
 
 testhdf5: $(TEST_OBJ)
-	@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
 
 dsets: dsets.lo
-	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
 
 @CONCLUDE@
-- 
cgit v0.12