Merge changes from r1239:r1240 on 4.2 branch. Refs #115.

git-svn-id: https://svn.nexusformat.org/code/tags/4.2.0@1241 ff5d1e40-2be0-497f-93bd-dc18237bd3c7

applications/Makefile.am

@@ -57,23 +57,23 @@ bin_PROGRAMS = nxbrowse nx2dtd nxconvert nxvalidate $(F90_TARGETS)
 
 nxconvert_SOURCES = nxconvert.c nxconvert_common.c nxconvert_common.h
 nxconvert_LDADD = $(LIBNEXUS)
-nxconvert_LDFLAGS = -static $(LDFLAGS)
+nxconvert_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 nxvalidate_SOURCES = nxvalidate.c nxconvert_common.c nxconvert_common.h
 nxvalidate_LDADD = $(LIBNEXUS)
-nxvalidate_LDFLAGS = -static $(LDFLAGS)
+nxvalidate_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 nxbrowse_SOURCES = NXbrowse.c
 nxbrowse_LDADD = $(LIBNEXUS)
-nxbrowse_LDFLAGS = -static $(LDFLAGS)
+nxbrowse_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 #NXtoXML_SOURCES = NXtoXML.c 
 #NXtoXML_LDADD = $(LIBNEXUS)
 #NXtoXML_LDFLAGS = -static $(LDFLAGS)
 
 nx2dtd_SOURCES = NXtoDTD.c 
 nx2dtd_LDADD = $(LIBNEXUS)
-nx2dtd_LDFLAGS = -static $(LDFLAGS)
+nx2dtd_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 #NXtoNX4_SOURCES = NXtoNX4.c 
 #NXtoNX4_LDADD = $(LIBNEXUS)
@@ -84,11 +84,11 @@ nx2dtd_LDFLAGS = -static $(LDFLAGS)
 NXdump_SOURCES = NXdump.f90
 NXdump_LDADD = $(LIBNEXUS90)
 NXdump_LINK = $(FCLINK)
-NXdump_LDFLAGS = -static $(LDFLAGS)
+NXdump_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 NXbrowse90_SOURCES = NXbrowse90.f90
 NXbrowse90_LDADD = $(LIBNEXUS90)
 NXbrowse90_LINK = $(FCLINK)
-NXbrowse90_LDFLAGS = -static $(LDFLAGS)
+NXbrowse90_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 include $(top_srcdir)/build_rules.am

applications/NXdir/Makefile.am

@@ -35,7 +35,7 @@ bin_PROGRAMS = nxdir
 nxdir_SOURCES = main.cpp string_util.cpp tree.cpp data.cpp data_writer.cpp \
 		nxdir.h nxdir_help.h
 nxdir_LDADD = $(LIBNEXUS)
-nxdir_LDFLAGS = -static $(LDFLAGS)
+nxdir_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 EXTRA_DIST = CHANGES LICENSE README TODO
 
 ## extra dependencies (don;t thing needed now)

applications/NXsummary/Makefile.am

@@ -36,6 +36,6 @@ noinst_HEADERS = data_util.hpp nxsummary.hpp string_util.hpp preferences.hpp con
    tclap/ArgException.h tclap/Arg.h tclap/CmdLine.h tclap/CmdLineInterface.h tclap/CmdLineOutput.h tclap/DocBookOutput.h tclap/HelpVisitor.h tclap/IgnoreRestVisitor.h tclap/MultiArg.h tclap/StdOutput.h tclap/SwitchArg.h tclap/UnlabeledMultiArg.h tclap/UnlabeledValueArg.h tclap/ValueArg.h tclap/VersionVisitor.h tclap/Visitor.h tclap/XorHandler.h
 nxsummary_SOURCES = data_util.cpp main.cpp string_util.cpp preferences.cpp output.cpp
 nxsummary_LDADD = $(LIBNEXUS)
-nxsummary_LDFLAGS = -static $(LDFLAGS)
+nxsummary_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 EXTRA_DIST = LICENSE tclap/AUTHORS tclap/COPYING tclap/README
 include $(top_srcdir)/build_rules.am

applications/NXtranslate/Makefile.am

@@ -65,7 +65,7 @@ nxtranslate_LDADD = $(LIBNEXUS) -lxml2 \
 	spec/libSpec.la \
 	esrf_edf/libEdf.la
 
-nxtranslate_LDFLAGS = -static $(LDFLAGS)
+nxtranslate_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
 
 #EXTRA_DIST = CHANGES LICENSE README TODO
 

applications/nxingest/Makefile.am

@@ -11,7 +11,7 @@ nxingest_SOURCES = nxingest_main.cpp nxingest_utils.cpp \
    nxingest_debug.h nxingest.h nxingest_main.h nxingest_nexus.h \
    nxingest_parse.h nxingest_time.h nxingest_utils.h
 nxingest_LDADD = $(LIBNEXUS)
-nxingest_LDFLAGS = -static $(XML_LDFLAGS) $(LDFLAGS)
+nxingest_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 
 EXTRA_DIST=nxingest.txt gpl.txt
 

test/Makefile.am

@@ -121,22 +121,22 @@ nxtranslate:
 TESTS_ENVIRONMENT=env PYTHON=$(PYTHON) IDL_PATH="@abs_top_srcdir@/bindings/idl:<IDL_DEFAULT>" IDL_DLM_PATH="@abs_top_builddir@/bindings/idl:<IDL_DEFAULT>" LD_LIBRARY_PATH=@abs_top_builddir@/src/.libs:@abs_top_builddir@/bindings/cpp/.libs:@abs_top_builddir@/bindings/idl:$${LD_LIBRARY_PATH}:@EXTRA_LD_LIBRARY_PATH@:/usr/local/lib DYLD_LIBRARY_PATH=@abs_top_builddir@/src/.libs:@abs_top_builddir@/bindings/cpp/.libs:@abs_top_builddir@/bindings/idl:$${DYLD_LIBRARY_PATH}:@EXTRA_LD_LIBRARY_PATH@:/usr/local/lib
 
 run_test_SOURCES=run_test.c
-run_test_LDFLAGS=-static $(LDFLAGS)
+run_test_LDFLAGS=-static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 
 skip_test_SOURCES=skip_test.c
-skip_test_LDFLAGS=-static $(LDFLAGS)
+skip_test_LDFLAGS=-static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 
 leak_test1_SOURCES=leak_test1.c
 leak_test1_LDADD=$(LIBNEXUS)
-leak_test1_LDFLAGS=-static $(LDFLAGS)
+leak_test1_LDFLAGS=-static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 
 leak_test2_SOURCES=leak_test2.cxx
 leak_test2_LDADD=$(LIBNEXUS)
-leak_test2_LDFLAGS=-static $(LDFLAGS)
+leak_test2_LDFLAGS=-static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 
 leak_test3_SOURCES=leak_test3.cxx
 leak_test3_LDADD=$(LIBNEXUS)
-leak_test3_LDFLAGS=-static $(LDFLAGS)
+leak_test3_LDFLAGS=-static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 
 
 if HAVE_XML
@@ -146,11 +146,11 @@ napi_test_xml_LDADD = $(LIBNEXUS) @XML_LDFLAGS@
 napi_test_xml_static_SOURCES = napi_test.c
 napi_test_xml_static_CPPFLAGS = -I$(top_srcdir)/include @XML_CPPFLAGS@
 napi_test_xml_static_LDADD = $(LIBNEXUS) @XML_LDFLAGS@
-napi_test_xml_static_LDFLAGS = -static $(LDFLAGS)
+napi_test_xml_static_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 napi_test_xml_table_static_SOURCES = napi_test.c
 napi_test_xml_table_static_CPPFLAGS = -I$(top_srcdir)/include @XML_CPPFLAGS@
 napi_test_xml_table_static_LDADD = $(LIBNEXUS) @XML_LDFLAGS@
-napi_test_xml_table_static_LDFLAGS = -static $(LDFLAGS)
+napi_test_xml_table_static_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 napi_test_cpp_xml_SOURCES = napi_test_cpp.cxx
 napi_test_cpp_xml_LDADD = $(LIBNEXUSCPP)
 napi_test_cpp_xml_table_SOURCES = napi_test_cpp.cxx
@@ -171,14 +171,14 @@ napi_test_hdf4_LDADD = $(LIBNEXUS) @HDF4_LDFLAGS@
 napi_test_hdf4_static_SOURCES = napi_test.c
 napi_test_hdf4_static_CPPFLAGS = -I$(top_srcdir)/include @HDF4_CPPFLAGS@
 napi_test_hdf4_static_LDADD = $(LIBNEXUS) @HDF4_LDFLAGS@
-napi_test_hdf4_static_LDFLAGS = -static $(LDFLAGS)
+napi_test_hdf4_static_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 napi_test_cpp_hdf4_SOURCES = napi_test_cpp.cxx
 napi_test_cpp_hdf4_LDADD = $(LIBNEXUSCPP)
 if HAVE_F77
 napif_test_hdf4_SOURCES = napif4_test.f
 napif_test_hdf4_LDADD = $(LIBNEXUS77) # $(FLIBS)
 napif_test_hdf4_LINK = $(F77LINK)
-napif_test_hdf4_LDFLAGS = -static $(LDFLAGS)
+napif_test_hdf4_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 else
 napif_test_hdf4_SOURCES = dummy.c
 napif_test_hdf4_LINK = $(LINK)
@@ -199,14 +199,14 @@ napi_test_hdf5_LDADD = $(LIBNEXUS) @HDF5_LDFLAGS@
 napi_test_hdf5_static_SOURCES = napi_test.c
 napi_test_hdf5_static_CPPFLAGS = -I$(top_srcdir)/include @HDF5_CPPFLAGS@
 napi_test_hdf5_static_LDADD = $(LIBNEXUS) @HDF5_LDFLAGS@
-napi_test_hdf5_static_LDFLAGS = -static $(LDFLAGS)
+napi_test_hdf5_static_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 napi_test_cpp_hdf5_SOURCES = napi_test_cpp.cxx
 napi_test_cpp_hdf5_LDADD=$(LIBNEXUSCPP)
 if HAVE_F77
 napif_test_hdf5_SOURCES = napif5_test.f
 napif_test_hdf5_LDADD = $(LIBNEXUS77) # $(FLIBS)
 napif_test_hdf5_LINK = $(F77LINK)
-napif_test_hdf5_LDFLAGS = -static $(LDFLAGS)
+napif_test_hdf5_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 else
 napif_test_hdf5_SOURCES = dummy.c
 napif_test_hdf5_LINK = $(LINK)
@@ -224,7 +224,7 @@ if HAVE_F90
 NXtest_SOURCES = NXtest.f90
 NXtest_LDADD = $(LIBNEXUS90)
 NXtest_LINK = $(FCLINK)
-NXtest_LDFLAGS = -static $(LDFLAGS)
+NXtest_LDFLAGS = -static $(HDF4_LDFLAGS) $(HDF5_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
 else
 NXtest_SOURCES = dummy.c
 NXtest_LINK = $(LINK)