From ed9449e0092f4e6ffa2279f07017e7cc4061fece Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Fri, 10 Feb 2006 11:29:34 -0500 Subject: [svn-r11932] Purpose: bug fix Description: the --disable-hl switch was causing linking errors on gif2h5 that uses image api (bugzilla #1) Solution: used the condional macro for hl to build gif2h5 Platforms tested: linux Misc. update: --- hl/tools/gif2h5/Makefile.am | 16 ++++++++++++++++ hl/tools/gif2h5/Makefile.in | 44 ++++++++++++++++++++++++++++++++------------ tools/gifconv/Makefile.am | 16 ++++++++++++++++ tools/gifconv/Makefile.in | 44 ++++++++++++++++++++++++++++++++------------ 4 files changed, 96 insertions(+), 24 deletions(-) diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am index 5318869..e8f6a56 100644 --- a/hl/tools/gif2h5/Makefile.am +++ b/hl/tools/gif2h5/Makefile.am @@ -23,12 +23,28 @@ include $(top_srcdir)/config/commence.am INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src # These are our main targets, the tools + +if BUILD_HDF5_HL_CONDITIONAL bin_PROGRAMS=gif2h5 h52gif +else +bin_PROGRAMS=h52gif +endif +if BUILD_HDF5_HL_CONDITIONAL gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c +endif + h52gif_SOURCES=hdf2gif.c hdfgifwr.c readhdf.c + + # Programs all depend on the hdf5 library and the tools library +if BUILD_HDF5_HL_CONDITIONAL LDADD=$(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) +else +LDADD=$(LIBH5TOOLS) $(LIBHDF5) +endif + + include $(top_srcdir)/config/conclude.am diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index d645719..ee2767f 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -57,7 +57,9 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude.am -bin_PROGRAMS = gif2h5$(EXEEXT) h52gif$(EXEEXT) +@BUILD_HDF5_HL_CONDITIONAL_FALSE@bin_PROGRAMS = h52gif$(EXEEXT) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@bin_PROGRAMS = gif2h5$(EXEEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ h52gif$(EXEEXT) subdir = tools/gifconv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -69,21 +71,36 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \ - decompress.$(OBJEXT) gifread.$(OBJEXT) writehdf.$(OBJEXT) +am__gif2h5_SOURCES_DIST = gif2hdf.c gif2mem.c decompress.c gifread.c \ + writehdf.c +@BUILD_HDF5_HL_CONDITIONAL_TRUE@am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ gif2mem.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ decompress.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ gifread.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ writehdf.$(OBJEXT) gif2h5_OBJECTS = $(am_gif2h5_OBJECTS) gif2h5_LDADD = $(LDADD) am__DEPENDENCIES_1 = $(top_builddir)/tools/lib/libh5tools.la -am__DEPENDENCIES_2 = $(top_builddir)/hl/src/libhdf5_hl.la -am__DEPENDENCIES_3 = $(top_builddir)/src/libhdf5.la -gif2h5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) +am__DEPENDENCIES_2 = $(top_builddir)/src/libhdf5.la +am__DEPENDENCIES_3 = $(top_builddir)/hl/src/libhdf5_hl.la +@BUILD_HDF5_HL_CONDITIONAL_FALSE@gif2h5_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_2) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@gif2h5_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_3) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_2) am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT) \ readhdf.$(OBJEXT) h52gif_OBJECTS = $(am_h52gif_OBJECTS) h52gif_LDADD = $(LDADD) -h52gif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) +@BUILD_HDF5_HL_CONDITIONAL_FALSE@h52gif_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_2) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@h52gif_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_3) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles @@ -96,7 +113,7 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(gif2h5_SOURCES) $(h52gif_SOURCES) -DIST_SOURCES = $(gif2h5_SOURCES) $(h52gif_SOURCES) +DIST_SOURCES = $(am__gif2h5_SOURCES_DIST) $(h52gif_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -340,11 +357,14 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src -gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c +@BUILD_HDF5_HL_CONDITIONAL_TRUE@gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c h52gif_SOURCES = hdf2gif.c hdfgifwr.c readhdf.c +@BUILD_HDF5_HL_CONDITIONAL_FALSE@LDADD = $(LIBH5TOOLS) $(LIBHDF5) + +#h52gif_DEPENDENCIES=$(LIBH5_HL) # Programs all depend on the hdf5 library and the tools library -LDADD = $(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@LDADD = $(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., diff --git a/tools/gifconv/Makefile.am b/tools/gifconv/Makefile.am index 5318869..e8f6a56 100644 --- a/tools/gifconv/Makefile.am +++ b/tools/gifconv/Makefile.am @@ -23,12 +23,28 @@ include $(top_srcdir)/config/commence.am INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src # These are our main targets, the tools + +if BUILD_HDF5_HL_CONDITIONAL bin_PROGRAMS=gif2h5 h52gif +else +bin_PROGRAMS=h52gif +endif +if BUILD_HDF5_HL_CONDITIONAL gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c +endif + h52gif_SOURCES=hdf2gif.c hdfgifwr.c readhdf.c + + # Programs all depend on the hdf5 library and the tools library +if BUILD_HDF5_HL_CONDITIONAL LDADD=$(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) +else +LDADD=$(LIBH5TOOLS) $(LIBHDF5) +endif + + include $(top_srcdir)/config/conclude.am diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index d645719..ee2767f 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -57,7 +57,9 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude.am -bin_PROGRAMS = gif2h5$(EXEEXT) h52gif$(EXEEXT) +@BUILD_HDF5_HL_CONDITIONAL_FALSE@bin_PROGRAMS = h52gif$(EXEEXT) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@bin_PROGRAMS = gif2h5$(EXEEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ h52gif$(EXEEXT) subdir = tools/gifconv ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -69,21 +71,36 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \ - decompress.$(OBJEXT) gifread.$(OBJEXT) writehdf.$(OBJEXT) +am__gif2h5_SOURCES_DIST = gif2hdf.c gif2mem.c decompress.c gifread.c \ + writehdf.c +@BUILD_HDF5_HL_CONDITIONAL_TRUE@am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ gif2mem.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ decompress.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ gifread.$(OBJEXT) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ writehdf.$(OBJEXT) gif2h5_OBJECTS = $(am_gif2h5_OBJECTS) gif2h5_LDADD = $(LDADD) am__DEPENDENCIES_1 = $(top_builddir)/tools/lib/libh5tools.la -am__DEPENDENCIES_2 = $(top_builddir)/hl/src/libhdf5_hl.la -am__DEPENDENCIES_3 = $(top_builddir)/src/libhdf5.la -gif2h5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) +am__DEPENDENCIES_2 = $(top_builddir)/src/libhdf5.la +am__DEPENDENCIES_3 = $(top_builddir)/hl/src/libhdf5_hl.la +@BUILD_HDF5_HL_CONDITIONAL_FALSE@gif2h5_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_2) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@gif2h5_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_3) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_2) am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT) \ readhdf.$(OBJEXT) h52gif_OBJECTS = $(am_h52gif_OBJECTS) h52gif_LDADD = $(LDADD) -h52gif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) +@BUILD_HDF5_HL_CONDITIONAL_FALSE@h52gif_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_FALSE@ $(am__DEPENDENCIES_2) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@h52gif_DEPENDENCIES = \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_1) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_3) \ +@BUILD_HDF5_HL_CONDITIONAL_TRUE@ $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles @@ -96,7 +113,7 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(gif2h5_SOURCES) $(h52gif_SOURCES) -DIST_SOURCES = $(gif2h5_SOURCES) $(h52gif_SOURCES) +DIST_SOURCES = $(am__gif2h5_SOURCES_DIST) $(h52gif_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -340,11 +357,14 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src -gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c +@BUILD_HDF5_HL_CONDITIONAL_TRUE@gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c h52gif_SOURCES = hdf2gif.c hdfgifwr.c readhdf.c +@BUILD_HDF5_HL_CONDITIONAL_FALSE@LDADD = $(LIBH5TOOLS) $(LIBHDF5) + +#h52gif_DEPENDENCIES=$(LIBH5_HL) # Programs all depend on the hdf5 library and the tools library -LDADD = $(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) +@BUILD_HDF5_HL_CONDITIONAL_TRUE@LDADD = $(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., -- cgit v0.12