summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-08-31 18:38:17 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-08-31 18:38:17 (GMT)
commit3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e (patch)
treeb06170309bdc41e49843a6a7a66b94bb03bb43e5 /hl
parentee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85 (diff)
downloadhdf5-3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e.zip
hdf5-3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e.tar.gz
hdf5-3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e.tar.bz2
[svn-r17441] Purpose:
Merge from trunk Description: Merged revisions 17228 and 17440 from trunk to 1.8 Specifically, this brings support of --enable-static-exec flag into 1.8 Tested: Manually on jam, linew, smirom, liberty, plus h5committest. Currently, there is no automatic regression test that exists due to portability issues. Behavior is both different and undefined on certain systems (and while 'nm' command seems to exist on all machines, behavior is confirmed to be different on Mac, possibly others). Solution will be to set up some sort of framework in daily tests to build statically, remove shared paths, and verify executables can function.
Diffstat (limited to 'hl')
-rw-r--r--hl/tools/gif2h5/Makefile.am4
-rw-r--r--hl/tools/gif2h5/Makefile.in14
2 files changed, 16 insertions, 2 deletions
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am
index 076b915..f1cec06 100644
--- a/hl/tools/gif2h5/Makefile.am
+++ b/hl/tools/gif2h5/Makefile.am
@@ -31,6 +31,10 @@ check_SCRIPTS=$(TEST_SCRIPT)
bin_PROGRAMS=gif2h5 h52gif
noinst_PROGRAMS=h52gifgentst
+# Add h52gif and gif2h5 specific linker flags here
+h52gif_LDFLAGS = $(LT_STATIC_EXEC)
+gif2h5_LDFLAGS = $(LT_STATIC_EXEC)
+
gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c
h52gif_SOURCES=hdf2gif.c hdfgifwr.c
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 425dc42..71a16c4 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -73,10 +73,16 @@ am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \
gif2h5_OBJECTS = $(am_gif2h5_OBJECTS)
gif2h5_LDADD = $(LDADD)
gif2h5_DEPENDENCIES = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
+gif2h5_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gif2h5_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT)
h52gif_OBJECTS = $(am_h52gif_OBJECTS)
h52gif_LDADD = $(LDADD)
h52gif_DEPENDENCIES = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
+h52gif_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h52gif_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h52gifgentst_OBJECTS = h52gifgentst.$(OBJEXT)
h52gifgentst_OBJECTS = $(am_h52gifgentst_OBJECTS)
h52gifgentst_LDADD = $(LDADD)
@@ -359,6 +365,10 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src
# These are our main targets, the tools
TEST_SCRIPT = $(srcdir)/h52giftest.sh
check_SCRIPTS = $(TEST_SCRIPT)
+
+# Add h52gif and gif2h5 specific linker flags here
+h52gif_LDFLAGS = $(LT_STATIC_EXEC)
+gif2h5_LDFLAGS = $(LT_STATIC_EXEC)
gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c
h52gif_SOURCES = hdf2gif.c hdfgifwr.c
h52gifgentst_SOURCES = h52gifgentst.c
@@ -470,10 +480,10 @@ clean-noinstPROGRAMS:
rm -f $$list
gif2h5$(EXEEXT): $(gif2h5_OBJECTS) $(gif2h5_DEPENDENCIES)
@rm -f gif2h5$(EXEEXT)
- $(LINK) $(gif2h5_OBJECTS) $(gif2h5_LDADD) $(LIBS)
+ $(gif2h5_LINK) $(gif2h5_OBJECTS) $(gif2h5_LDADD) $(LIBS)
h52gif$(EXEEXT): $(h52gif_OBJECTS) $(h52gif_DEPENDENCIES)
@rm -f h52gif$(EXEEXT)
- $(LINK) $(h52gif_OBJECTS) $(h52gif_LDADD) $(LIBS)
+ $(h52gif_LINK) $(h52gif_OBJECTS) $(h52gif_LDADD) $(LIBS)
h52gifgentst$(EXEEXT): $(h52gifgentst_OBJECTS) $(h52gifgentst_DEPENDENCIES)
@rm -f h52gifgentst$(EXEEXT)
$(LINK) $(h52gifgentst_OBJECTS) $(h52gifgentst_LDADD) $(LIBS)