mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r7293] Purpose:

Browse Source 
Code cleanup

Description:
    Remove some redundant libtool definitions, etc.

Platforms tested:
    h5committested
This commit is contained in:
Quincey Koziol 2003-08-08 13:33:45 -05:00
parent c1f6f9defd
commit 26e94d4eef
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
c++/test/Makefile.in
View File

@ -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@

4
config/commence.in
View File

@ -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)

7
fortran/test/Makefile.in
View File

@ -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@

3
fortran/testpar/Makefile.in
View File

@ -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@