diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2016-03-22 03:00:32 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2016-03-22 03:00:32 (GMT) |
commit | 37117468e95940b2e98982088cd2ca994fc9d306 (patch) | |
tree | ba43f1ba606c3da3ece5720ffb9860aca6ef3db1 /hl | |
parent | 5ed21dc1063ec0b260d68eda16da18fa158e2c2d (diff) | |
download | hdf5-37117468e95940b2e98982088cd2ca994fc9d306.zip hdf5-37117468e95940b2e98982088cd2ca994fc9d306.tar.gz hdf5-37117468e95940b2e98982088cd2ca994fc9d306.tar.bz2 |
[svn-r29493] Add LT_*_VERS_* variables for HDF5 wrapper libraries.
Add configure fix to create .classes directories in java subdirs.
Tested with h5committest.new.
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/src/Makefile.am | 2 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 23 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.am | 2 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 23 | ||||
-rw-r--r-- | hl/src/Makefile.am | 2 | ||||
-rw-r--r-- | hl/src/Makefile.in | 23 |
6 files changed, 69 insertions, 6 deletions
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index b268948..c78f5fa 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src lib_LTLIBRARIES=libhdf5_hl_cpp.la # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) -libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_HL_CXX_VERS_INTERFACE):$(LT_HL_CXX_VERS_REVISION):$(LT_HL_CXX_VERS_AGE) $(AM_LDFLAGS) # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index b37a8cf..90694e2 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -738,12 +738,33 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 100 LT_VERS_REVISION = 0 LT_VERS_AGE = 0 +LT_CXX_VERS_INTERFACE = 100 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 100 +LT_F_VERS_REVISION = 0 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 100 +LT_HL_VERS_REVISION = 0 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 100 +LT_HL_CXX_VERS_REVISION = 0 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 100 +LT_HL_F_VERS_REVISION = 0 +LT_HL_F_VERS_AGE = 0 +LT_JAVA_VERS_INTERFACE = 100 +LT_JAVA_VERS_REVISION = 0 +LT_JAVA_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 100 +LT_TOOLS_VERS_REVISION = 0 +LT_TOOLS_VERS_AGE = 0 # This is our main target lib_LTLIBRARIES = libhdf5_hl_cpp.la # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) -libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_HL_CXX_VERS_INTERFACE):$(LT_HL_CXX_VERS_REVISION):$(LT_HL_CXX_VERS_AGE) $(AM_LDFLAGS) # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index d190ed1..571ca45 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -30,7 +30,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s lib_LTLIBRARIES=libhdf5hl_fortran.la # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) -libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 90c8c17..f1f9555 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -766,12 +766,33 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 100 LT_VERS_REVISION = 0 LT_VERS_AGE = 0 +LT_CXX_VERS_INTERFACE = 100 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 100 +LT_F_VERS_REVISION = 0 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 100 +LT_HL_VERS_REVISION = 0 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 100 +LT_HL_CXX_VERS_REVISION = 0 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 100 +LT_HL_F_VERS_REVISION = 0 +LT_HL_F_VERS_AGE = 0 +LT_JAVA_VERS_INTERFACE = 100 +LT_JAVA_VERS_REVISION = 0 +LT_JAVA_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 100 +LT_TOOLS_VERS_REVISION = 0 +LT_TOOLS_VERS_AGE = 0 # Our main target, the high-level fortran library lib_LTLIBRARIES = libhdf5hl_fortran.la # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) -libhdf5hl_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5hl_fortran_la_LDFLAGS = -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS) # Source files for the library #if BUILD_PARALLEL_CONDITIONAL diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index c1e6810..fef3450 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src lib_LTLIBRARIES=libhdf5_hl.la # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am) -libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS) # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c H5LD.c diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 8e59e34..c5d4642 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -737,12 +737,33 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 LT_VERS_INTERFACE = 100 LT_VERS_REVISION = 0 LT_VERS_AGE = 0 +LT_CXX_VERS_INTERFACE = 100 +LT_CXX_VERS_REVISION = 0 +LT_CXX_VERS_AGE = 0 +LT_F_VERS_INTERFACE = 100 +LT_F_VERS_REVISION = 0 +LT_F_VERS_AGE = 0 +LT_HL_VERS_INTERFACE = 100 +LT_HL_VERS_REVISION = 0 +LT_HL_VERS_AGE = 0 +LT_HL_CXX_VERS_INTERFACE = 100 +LT_HL_CXX_VERS_REVISION = 0 +LT_HL_CXX_VERS_AGE = 0 +LT_HL_F_VERS_INTERFACE = 100 +LT_HL_F_VERS_REVISION = 0 +LT_HL_F_VERS_AGE = 0 +LT_JAVA_VERS_INTERFACE = 100 +LT_JAVA_VERS_REVISION = 0 +LT_JAVA_VERS_AGE = 0 +LT_TOOLS_VERS_INTERFACE = 100 +LT_TOOLS_VERS_REVISION = 0 +LT_TOOLS_VERS_AGE = 0 # This library is our main target. lib_LTLIBRARIES = libhdf5_hl.la # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am) -libhdf5_hl_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_la_LDFLAGS = -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS) # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES = H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c H5LD.c |