Changeset 1241 for tags/4.2.0/test/Makefile.am

Timestamp:

16/04/09 08:32:29 (3 years ago)

Author:

Freddie Akeroyd

Message:

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

File:

• tags/4.2.0/test/Makefile.am (modified) (7 diffs)

tags/4.2.0/test/Makefile.am

@@ -122 +122 @@
 
 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)
 
 
@@ -147 +147 @@
 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)
@@ -172 +172 @@
 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)
@@ -179 +179 @@
 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
@@ -200 +200 @@
 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)
@@ -207 +207 @@
 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
@@ -225 +225 @@
 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