summaryrefslogtreecommitdiffstats
path: root/hl/tools
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-03-03 21:49:10 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-03-03 21:49:10 (GMT)
commitea9f792cd794024f766fc844b49f9eda73e9bc14 (patch)
treea6f32669a2272b7f87e5af94aceebef50639f9e5 /hl/tools
parent142705d983f9ac719ad7e64fa66b4f0aa25fad70 (diff)
downloadhdf5-ea9f792cd794024f766fc844b49f9eda73e9bc14.zip
hdf5-ea9f792cd794024f766fc844b49f9eda73e9bc14.tar.gz
hdf5-ea9f792cd794024f766fc844b49f9eda73e9bc14.tar.bz2
[svn-r12001] Purpose:
Moved gif2h5 tool to hl directory Description: Added a tools directory under the hl directory and moved the gif2h5 tool to that directory. Solution: The gif2h5 tool was originally built in the tools directory, but this introduced dependency issues that required special checks in the Makefiles.am and required the top-level build order to be changed because it depended on the HL library. For simplicity in the Makefiles now and in the future, the gif2h5 tool was moved to be underneath the hl library. Platforms tested: mir, copper, modi4, shanti
Diffstat (limited to 'hl/tools')
-rw-r--r--hl/tools/gif2h5/Makefile.am19
-rw-r--r--hl/tools/gif2h5/Makefile.in57
2 files changed, 23 insertions, 53 deletions
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am
index e8f6a56..cd5c305 100644
--- a/hl/tools/gif2h5/Makefile.am
+++ b/hl/tools/gif2h5/Makefile.am
@@ -24,27 +24,14 @@ 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
-
-
+# Programs all depend on the hdf5 library, the tools library, and the HL
+# library.
+LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
include $(top_srcdir)/config/conclude.am
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 092521c..9fd8142 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -38,7 +38,7 @@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -57,10 +57,8 @@ host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
-@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
+bin_PROGRAMS = gif2h5$(EXEEXT) h52gif$(EXEEXT)
+subdir = hl/tools/gif2h5
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -71,36 +69,21 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-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)
+am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \
+ decompress.$(OBJEXT) gifread.$(OBJEXT) writehdf.$(OBJEXT)
gif2h5_OBJECTS = $(am_gif2h5_OBJECTS)
gif2h5_LDADD = $(LDADD)
-am__DEPENDENCIES_1 = $(top_builddir)/tools/lib/libh5tools.la
-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__DEPENDENCIES_1 = $(top_builddir)/hl/src/libhdf5_hl.la
+am__DEPENDENCIES_2 = $(top_builddir)/tools/lib/libh5tools.la
+am__DEPENDENCIES_3 = $(top_builddir)/src/libhdf5.la
+gif2h5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_3)
am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT) \
readhdf.$(OBJEXT)
h52gif_OBJECTS = $(am_h52gif_OBJECTS)
h52gif_LDADD = $(LDADD)
-@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)
+h52gif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_3)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
am__depfiles_maybe = depfiles
@@ -113,7 +96,7 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(gif2h5_SOURCES) $(h52gif_SOURCES)
-DIST_SOURCES = $(am__gif2h5_SOURCES_DIST) $(h52gif_SOURCES)
+DIST_SOURCES = $(gif2h5_SOURCES) $(h52gif_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -357,12 +340,12 @@ 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
-@BUILD_HDF5_HL_CONDITIONAL_TRUE@gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c
+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)
-# Programs all depend on the hdf5 library and the tools library
-@BUILD_HDF5_HL_CONDITIONAL_TRUE@LDADD = $(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5)
+# Programs all depend on the hdf5 library, the tools library, and the HL
+# library.
+LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(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.,
@@ -393,9 +376,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/gifconv/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hl/tools/gif2h5/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/gifconv/Makefile
+ $(AUTOMAKE) --foreign hl/tools/gif2h5/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -543,7 +526,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../../config
+ $(mkdir_p) $(distdir)/../../../config
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \