diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-23 23:10:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-23 23:10:30 (GMT) |
| commit | 51fd7c574f80ba3031be63c1a88fb08876bf1d93 (patch) | |
| tree | 3c3debf3b39f0eac9aa431a016bd4e98f974a7c9 /hl | |
| parent | 239c45e0f5845406f931f612cf1e88a2203917ae (diff) | |
| download | hdf5-51fd7c574f80ba3031be63c1a88fb08876bf1d93.zip hdf5-51fd7c574f80ba3031be63c1a88fb08876bf1d93.tar.gz hdf5-51fd7c574f80ba3031be63c1a88fb08876bf1d93.tar.bz2 | |
[svn-r17233] Description:
Bring r17209:17230 from trunk to revise_chunks branch.
Tested on:
Mac OS X/32 10.5.7 (amazon) debug
h5committest not required on this branch
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/tools/gif2h5/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 14 |
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 a3de89d..f1ab9e5 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -71,10 +71,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) @@ -352,6 +358,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 @@ -445,10 +455,10 @@ clean-noinstPROGRAMS: done 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) |