From 37117468e95940b2e98982088cd2ca994fc9d306 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Mon, 21 Mar 2016 22:00:32 -0500 Subject: [svn-r29493] Add LT_*_VERS_* variables for HDF5 wrapper libraries. Add configure fix to create .classes directories in java subdirs. Tested with h5committest.new. --- bin/h5vers | 18 +++++++++++------- c++/src/Makefile.am | 2 +- c++/src/Makefile.in | 23 ++++++++++++++++++++++- config/lt_vers.am | 30 +++++++++++++++++++++++++++--- configure | 10 ++++++++++ configure.ac | 7 +++++++ fortran/src/Makefile.am | 2 +- fortran/src/Makefile.in | 23 ++++++++++++++++++++++- hl/c++/src/Makefile.am | 2 +- hl/c++/src/Makefile.in | 23 ++++++++++++++++++++++- hl/fortran/src/Makefile.am | 2 +- hl/fortran/src/Makefile.in | 23 ++++++++++++++++++++++- hl/src/Makefile.am | 2 +- hl/src/Makefile.in | 23 ++++++++++++++++++++++- java/src/jni/Makefile.am | 2 +- java/src/jni/Makefile.in | 23 ++++++++++++++++++++++- src/Makefile.in | 21 +++++++++++++++++++++ 17 files changed, 214 insertions(+), 22 deletions(-) diff --git a/bin/h5vers b/bin/h5vers index 7e61dc8..e9df387 100755 --- a/bin/h5vers +++ b/bin/h5vers @@ -277,13 +277,17 @@ if ($LT_VERS && $version_increased) { local($_) = $contentsy; - my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m; - my $new_lt_revision = $lt_revision+1; - ($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m; - - open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n"; - print FILE $contentsy; - close FILE; +# As of the HDF5 v1.8.16 release, h5vers should not increment +# the LT_VERS numbers, so the next 6 lines are commented out. +# A future version may copy the numbers to H5public.h, so this +# section is retained for future reference. +# my ($lt_revision) = /^LT_VERS_REVISION\s*=\s*(\d+)/m; +# my $new_lt_revision = $lt_revision+1; +# ($contentsy) =~ s/^(LT_VERS_REVISION\s*=\s*)\d+/$1$new_lt_revision/m; + +# open FILE, ">$LT_VERS" or die "$LT_VERS: $!\n"; +# print FILE $contentsy; +# close FILE; } # Update the README.txt file diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index 84af348..6cd4768 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src lib_LTLIBRARIES=libhdf5_cpp.la # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am) -libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_cpp_la_LDFLAGS= -version-info $(LT_CXX_VERS_INTERFACE):$(LT_CXX_VERS_REVISION):$(LT_CXX_VERS_AGE) $(AM_LDFLAGS) bin_SCRIPTS=h5c++ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 44780c1..4479889 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -748,12 +748,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_cpp.la # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am) -libhdf5_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_cpp_la_LDFLAGS = -version-info $(LT_CXX_VERS_INTERFACE):$(LT_CXX_VERS_REVISION):$(LT_CXX_VERS_AGE) $(AM_LDFLAGS) bin_SCRIPTS = h5c++ # Source files for the library diff --git a/config/lt_vers.am b/config/lt_vers.am index 113c168..c6a5c03 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -40,10 +40,34 @@ LT_VERS_AGE = 0 ## Note that this versioning system doesn't attempt to handle ## the effects of the H5_V1_x_COMPAT flag. ## -## Since the revision number is automatically incremented by -## bin/h5vers, don't move LT_VERS_REVISION from the fourth line -## without also editing the script! +## Version numbers for wrapper shared library files. +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 # Copyright by The HDF Group. # Copyright by the Board of Trustees of the University of Illinois. diff --git a/configure b/configure index f59e9b5..d5cc449 100755 --- a/configure +++ b/configure @@ -33027,6 +33027,9 @@ fi ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/testflushrefresh.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/testswmr.sh test/test_plugin.sh test/test_usecases.sh test/testvdsswmr.sh testpar/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpvds.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5ls/testh5lsvds.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5clear.sh tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/misc/vds/Makefile tools/h5stat/testh5stat.sh tools/h5stat/Makefile tools/h5format_convert/Makefile tools/h5format_convert/testh5fc.sh tools/perform/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/src/H5fort_type_defines.h fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh java/Makefile java/src/Makefile java/src/jni/Makefile java/test/Makefile java/test/junit.sh java/examples/Makefile java/examples/intro/Makefile java/examples/intro/runExample.sh java/examples/datasets/Makefile java/examples/datasets/runExample.sh java/examples/datatypes/Makefile java/examples/datatypes/runExample.sh java/examples/groups/Makefile java/examples/groups/runExample.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/tools/h5watch/Makefile hl/tools/h5watch/testh5watch.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh" +ac_config_commands="$ac_config_commands .classes" + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -34264,6 +34267,12 @@ fi ac_aux_dir='$ac_aux_dir' +$MKDIR_P java/src/.classes; + $MKDIR_P java/test/.classes; + $MKDIR_P java/examples/intro/.classes; + $MKDIR_P java/examples/datasets/.classes; + $MKDIR_P java/examples/datatypes/.classes; + $MKDIR_P java/examples/groups/.classes _ACEOF @@ -34381,6 +34390,7 @@ do "hl/fortran/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/test/Makefile" ;; "hl/fortran/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/examples/Makefile" ;; "hl/fortran/examples/run-hlfortran-ex.sh") CONFIG_FILES="$CONFIG_FILES hl/fortran/examples/run-hlfortran-ex.sh" ;; + ".classes") CONFIG_COMMANDS="$CONFIG_COMMANDS .classes" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 6990386..8e52167 100644 --- a/configure.ac +++ b/configure.ac @@ -3594,6 +3594,13 @@ AC_CONFIG_FILES([src/libhdf5.settings hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh]) +AC_CONFIG_COMMANDS([.classes], [], [$MKDIR_P java/src/.classes; + $MKDIR_P java/test/.classes; + $MKDIR_P java/examples/intro/.classes; + $MKDIR_P java/examples/datasets/.classes; + $MKDIR_P java/examples/datatypes/.classes; + $MKDIR_P java/examples/groups/.classes]) + AC_OUTPUT chmod 755 tools/misc/h5cc diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index f4d192b..a271666 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -32,7 +32,7 @@ AM_FCLIBS=$(LIBHDF5) lib_LTLIBRARIES=libhdf5_fortran.la # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) -libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_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/fortran/src/Makefile.in b/fortran/src/Makefile.in index 6d973d0..a4d2f9d 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -776,13 +776,34 @@ 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 AM_FCLIBS = $(LIBHDF5) # This is our main target, the fortran library lib_LTLIBRARIES = libhdf5_fortran.la # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) -libhdf5_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_fortran_la_LDFLAGS = -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS) # Source files for the library. libhdf5_fortran_la_SOURCES = H5f90global.F90 \ 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 diff --git a/java/src/jni/Makefile.am b/java/src/jni/Makefile.am index 764fcdb..4667407 100644 --- a/java/src/jni/Makefile.am +++ b/java/src/jni/Makefile.am @@ -31,7 +31,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/java/src/jni $(JNIFLAGS) lib_LTLIBRARIES=libhdf5_java.la # Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am) -libhdf5_java_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_java_la_LDFLAGS= -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS) # Source files for the library libhdf5_java_la_SOURCES=exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp.c \ diff --git a/java/src/jni/Makefile.in b/java/src/jni/Makefile.in index a94d4b9..39879e0 100644 --- a/java/src/jni/Makefile.in +++ b/java/src/jni/Makefile.in @@ -738,6 +738,27 @@ 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 # Mark this directory as part of the JNI API JAVA_API = yes @@ -746,7 +767,7 @@ JAVA_API = yes lib_LTLIBRARIES = libhdf5_java.la # Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am) -libhdf5_java_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_java_la_LDFLAGS = -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS) # Source files for the library libhdf5_java_la_SOURCES = exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 1811cff..1ab9f9f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -863,6 +863,27 @@ 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 HDF5 library lib_LTLIBRARIES = libhdf5.la -- cgit v0.12