summaryrefslogtreecommitdiffstats
path: root/hl/tools
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-05-16 17:52:19 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-05-16 17:52:19 (GMT)
commite894bb1ec6c898ff3cc88e615e6a26f45bbd759a (patch)
treea95c5335431e2eb3b800b512b840cff28f106ab0 /hl/tools
parent9fd6621c925769ab119d2b1d8c2bfbb22ce2276e (diff)
downloadhdf5-e894bb1ec6c898ff3cc88e615e6a26f45bbd759a.zip
hdf5-e894bb1ec6c898ff3cc88e615e6a26f45bbd759a.tar.gz
hdf5-e894bb1ec6c898ff3cc88e615e6a26f45bbd759a.tar.bz2
[svn-r15020] Purpose: Configure Fix
Description: The test program h52gifgentst was getting installed in the bin directory during 'make install', and it shouldn't. Make now builds the program for use in testing but doesn't install it during 'make install'. Tested: kagiso
Diffstat (limited to 'hl/tools')
-rw-r--r--hl/tools/gif2h5/Makefile.am3
-rw-r--r--hl/tools/gif2h5/Makefile.in41
2 files changed, 27 insertions, 17 deletions
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am
index 9707b76..076b915 100644
--- a/hl/tools/gif2h5/Makefile.am
+++ b/hl/tools/gif2h5/Makefile.am
@@ -28,7 +28,8 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src
TEST_SCRIPT=$(srcdir)/h52giftest.sh
check_SCRIPTS=$(TEST_SCRIPT)
-bin_PROGRAMS=gif2h5 h52gif h52gifgentst
+bin_PROGRAMS=gif2h5 h52gif
+noinst_PROGRAMS=h52gifgentst
gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index a67df6c..adba1b7 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -52,7 +52,8 @@ 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) h52gifgentst$(EXEEXT)
+bin_PROGRAMS = gif2h5$(EXEEXT) h52gif$(EXEEXT)
+noinst_PROGRAMS = h52gifgentst$(EXEEXT)
TESTS = $(check_SCRIPTS)
subdir = hl/tools/gif2h5
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -64,7 +65,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \
decompress.$(OBJEXT) gifread.$(OBJEXT) writehdf.$(OBJEXT)
gif2h5_OBJECTS = $(am_gif2h5_OBJECTS)
@@ -434,6 +435,13 @@ clean-binPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
+
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
gif2h5$(EXEEXT): $(gif2h5_OBJECTS) $(gif2h5_DEPENDENCIES)
@rm -f gif2h5$(EXEEXT)
$(LINK) $(gif2h5_OBJECTS) $(gif2h5_LDADD) $(LIBS)
@@ -594,7 +602,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+ clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -653,19 +662,19 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
- clean clean-binPROGRAMS clean-generic clean-libtool ctags \
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
- pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS
+ clean clean-binPROGRAMS clean-generic clean-libtool \
+ clean-noinstPROGRAMS ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS
# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.