[svn-r7293] Purpose:

    Code cleanup

Description:
    Remove some redundant libtool definitions, etc.

Platforms tested:
    h5committested

4 files changed, 8 insertions, 12 deletions

diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index fbe8ca3..61ab057 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -33,8 +33,6 @@ CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(top_srcdir)/test -I$(hdf5_builddir)
 LIB=../src/libhdf5_cpp.la
 LIBHDF5=$(hdf5_builddir)/libhdf5.la
 
-LT_LINK_CXX_LIB=$(LT) --mode=link $(CXX) -static -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)
@@ -54,9 +52,9 @@ DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o)
 $(TEST_PROGS): $(LIB) $(LIBHDF5)
 
 testhdf5: $(TEST_OBJ)
-	@$(LT_LINK_CXX_EXE) -static $(CXXFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
+	@$(LT_LINK_CXX_EXE) $(CXXFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
 
 dsets: dsets.lo h5cpputil.lo
-	@$(LT_LINK_CXX_EXE) -static $(CXXFLAGS) -o $@ dsets.lo h5cpputil.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
+	@$(LT_LINK_CXX_EXE) $(CXXFLAGS) -o $@ dsets.lo h5cpputil.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
 
 @CONCLUDE@
diff --git a/config/commence.in b/config/commence.in
index 1eddd33..ad1ff45 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -72,8 +72,8 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 
 # Fortran compilation/linking stuff
 LT_FCOMPILE=$(LT) --mode=compile $(F9X)
-LT_LINK_FLIB=$(LT) --mode=link $(F9X) -static $(DYNAMIC_DIRS)
-LT_LINK_FEXE=$(LT) --mode=link $(F9X) $(LT_STATIC_EXEC) $(DYNAMIC_DIRS)
+LT_LINK_FLIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) $(DYNAMIC_DIRS)
+LT_LINK_FEXE=$(LT) --mode=link $(F9X) -static $(LT_STATIC_EXEC) $(DYNAMIC_DIRS)
 
 # C++ compilation/linking stuff
 LT_CXX_COMPILE=$(LT) --mode=compile $(CXX)
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 811aaaa..b60d7de 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -26,7 +26,6 @@ CPPFLAGS=-I. -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_FLIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir)
 FLIB=../src/libhdf5_fortran.la
 HDF5LIB=$(hdf5_builddir)/libhdf5.la
 TCLIB=../../test/.libs/libh5test.a
@@ -53,12 +52,12 @@ MOSTLYCLEAN=*.h5 *.tmp
 $(TEST_PROGS): $(LIB) $(FLIB) 
 
 fortranlib_test: $(FORTLIBTEST_OBJ)
-	@$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ $(FORTLIBTEST_OBJ) $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
+	@$(LT_LINK_FEXE) $(FFLAGS) -o $@ $(FORTLIBTEST_OBJ) $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
 
 fflush1: fflush1.lo 
-	@$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ fflush1.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
+	@$(LT_LINK_FEXE) $(FFLAGS) -o $@ fflush1.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
 
 fflush2: fflush2.lo 
-	@$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ fflush2.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
+	@$(LT_LINK_FEXE) $(FFLAGS) -o $@ fflush2.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
 
 @CONCLUDE@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 4397c0d..ea8d31b 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -24,7 +24,6 @@ hdf5_builddir=$(top_builddir)/src
 
 ## Add the include directory to the C preprocessor flags the the hdf5 library
 ## to the library list.
-LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir)
 LIBFORTRAN=../src/libhdf5_fortran.la
 LIBHDF5=$(hdf5_builddir)/libhdf5.la
 FTLIB=../test/libh5test_fortran.la
@@ -58,6 +57,6 @@ thyperslab_wr.lo:	    $(srcdir)/thyperslab_wr.f90 thdf5.lo
 ptesthdf5_fortran.lo:	    $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo
 
 ptesthdf5_fortran: thdf5.lo thyperslab_wr.lo ptesthdf5_fortran.lo
-	@$(LT_LINK_FEXE) -static $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo $(FTLIB) $(CTLIB) $(LIBFORTRAN) $(LIBHDF5) $(LIBS)
+	@$(LT_LINK_FEXE) $(FFLAGS) -o $@ ptesthdf5_fortran.lo thdf5.lo thyperslab_wr.lo $(FTLIB) $(CTLIB) $(LIBFORTRAN) $(LIBHDF5) $(LIBS)
 
 @CONCLUDE@