diff options
| author | lrknox <lrknox> | 2017-04-25 22:04:38 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-04-25 22:04:38 (GMT) |
| commit | 4a425eabc70cf5236afc41c2e56d4a57cc7c536e (patch) | |
| tree | 51a0d960e786289202f9f1c24f8a37b049500ca7 /java/src/jni | |
| parent | ce5637c6f17d8398b3db9d2fee704b1cee619996 (diff) | |
| download | hdf5-4a425eabc70cf5236afc41c2e56d4a57cc7c536e.zip hdf5-4a425eabc70cf5236afc41c2e56d4a57cc7c536e.tar.gz hdf5-4a425eabc70cf5236afc41c2e56d4a57cc7c536e.tar.bz2 | |
Commit version change to 1.10.1 and changes to Makfile.ins and other
files generated by running autogen.sh.
Diffstat (limited to 'java/src/jni')
| -rw-r--r-- | java/src/jni/Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/jni/Makefile.in b/java/src/jni/Makefile.in index b41a9be..929ee47 100644 --- a/java/src/jni/Makefile.in +++ b/java/src/jni/Makefile.in @@ -773,18 +773,20 @@ libhdf5_java_la_SOURCES = exceptionImp.c h5Constants.c nativeData.c h5util.c h5I # HDF5 Java (JNI) library depends on HDF5 Library. libhdf5_java_la_LIBADD = $(LIBHDF5) -# Automake needs to be taught how to build lib, progs, and tests targets. +# Automake needs to be taught how to build lib, dyn, progs and tests targets. # These will be filled in automatically for the most part (e.g., # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and # EXTRA_TEST variables are supplied to allow the user to force targets to -# be built at certain times. +# be built at certain times. LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \ $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB) +DYN = $(dyn_LTLIBRARIES) PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \ $(EXTRA_PROG) chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) +dyndir = $(libdir) TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) AM_SH_LOG_FLAGS = @@ -1294,6 +1296,7 @@ help: # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. +build-dyn: $(DYN) build-lib: $(LIB) build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(chk_TESTS) @@ -1301,7 +1304,7 @@ build-tests: $(LIB) $(PROGS) $(chk_TESTS) # General rule for recursive building targets. # BUILT_SOURCES contain targets that need to be built before anything else # in the directory (e.g., for Fortran type detection) -lib progs tests check-s check-p :: $(BUILT_SOURCES) +lib dyn progs tests check-s check-p :: $(BUILT_SOURCES) @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; @for d in X $(SUBDIRS); do \ if test $$d != X && test $$d != .; then \ |