summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-04-06 18:25:22 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-04-06 18:25:22 (GMT)
commit686e4f35010249e0489b49431836e4d34cfd24bc (patch)
tree8abd0103acfebfd0fc1e678da594fda48690b7c3
parent5c7a236baaa2c82e30dd52a6949dee7064e2a001 (diff)
downloadhdf5-686e4f35010249e0489b49431836e4d34cfd24bc.zip
hdf5-686e4f35010249e0489b49431836e4d34cfd24bc.tar.gz
hdf5-686e4f35010249e0489b49431836e4d34cfd24bc.tar.bz2
[svn-r10560] Purpose:
Feature: make install now installs h5perf Description: h5perf is now installed in hdf5/bin during 'make install.' Same change as in the 1.6 branch. Platforms tested: mir
-rwxr-xr-xMakefile.am7
-rw-r--r--Makefile.in26
-rw-r--r--perform/Makefile.am4
-rw-r--r--perform/Makefile.in67
4 files changed, 78 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am
index 74648a2..a15e389 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,7 +90,7 @@ lib progs:
fi; \
done
-# Make all and make tests also create tests in perform directory
+# Make all, tests, and (un)install also recurse into perform directory
all-local:
cd perform && $(MAKE) $(AM_MAKEFLAGS) all
tests:
@@ -100,6 +100,11 @@ tests:
fi; \
done
+install-exec-local:
+ cd perform && $(MAKE) $(AM_MAKEFLAGS) install
+uninstall-local:
+ cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+
# Clean and mostlyclean need to recurse into docs, examples, and perform
# directories unless they've already been distcleaned.
clean-local:
diff --git a/Makefile.in b/Makefile.in
index 65b548d..582efab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -714,7 +714,7 @@ info-am:
install-data-am:
-install-exec-am:
+install-exec-am: install-exec-local
install-info: install-info-recursive
@@ -741,7 +741,7 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-local
uninstall-info: uninstall-info-recursive
@@ -753,13 +753,14 @@ uninstall-info: uninstall-info-recursive
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installcheck-local \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-local mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ install-exec-am install-exec-local install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installcheck-local installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am uninstall-local
# Define rules for lib, progs, check, and tests.
@@ -773,7 +774,7 @@ lib progs:
fi; \
done
-# Make all and make tests also create tests in perform directory
+# Make all, tests, and (un)install also recurse into perform directory
all-local:
cd perform && $(MAKE) $(AM_MAKEFLAGS) all
tests:
@@ -783,6 +784,11 @@ tests:
fi; \
done
+install-exec-local:
+ cd perform && $(MAKE) $(AM_MAKEFLAGS) install
+uninstall-local:
+ cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+
# Clean and mostlyclean need to recurse into docs, examples, and perform
# directories unless they've already been distcleaned.
clean-local:
diff --git a/perform/Makefile.am b/perform/Makefile.am
index 4213802..24a2468 100644
--- a/perform/Makefile.am
+++ b/perform/Makefile.am
@@ -26,6 +26,10 @@ if BUILD_PARALLEL_CONDITIONAL
TEST_PROG_PARA=h5perf
endif
+# h5perf is run as a test in parallel when parallel is available, but it is
+# always installed with the tools during make install.
+bin_PROGRAMS=h5perf
+
# These are the programs that `make all' or `make tests' will build and which
# `make check' will run. List them in the order they should be run.
TEST_PROG = iopipe chunk overhead zip_perf perf_meta
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 6b2f2de..ce4e830 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -29,6 +29,7 @@
#
# HDF5 Library Performance Makefile(.in)
#
+
SOURCES = chunk.c $(h5perf_SOURCES) iopipe.c overhead.c perf.c perf_meta.c zip_perf.c
srcdir = @srcdir@
@@ -56,6 +57,7 @@ host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
+bin_PROGRAMS = h5perf$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) perf$(EXEEXT)
subdir = perform
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,9 +67,12 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@BUILD_PARALLEL_CONDITIONAL_TRUE@am__EXEEXT_1 = h5perf$(EXEEXT)
am__EXEEXT_2 = iopipe$(EXEEXT) chunk$(EXEEXT) overhead$(EXEEXT) \
zip_perf$(EXEEXT) perf_meta$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
chunk_SOURCES = chunk.c
chunk_OBJECTS = chunk.$(OBJEXT)
chunk_LDADD = $(LDADD)
@@ -389,6 +394,34 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -545,8 +578,11 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile all-local
+all-am: Makefile $(PROGRAMS) all-local
installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -574,8 +610,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
- mostlyclean-am
+clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+ clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -595,7 +631,7 @@ info-am:
install-data-am:
-install-exec-am:
+install-exec-am: install-binPROGRAMS
install-info: install-info-am
@@ -621,19 +657,20 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
- clean clean-checkPROGRAMS 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-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+ clean clean-binPROGRAMS clean-checkPROGRAMS 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-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# lib/progs/tests targets recurse into subdirectories. build-* targets