diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | Makefile.in | 21 | ||||
| -rw-r--r-- | systemtap.spec.in | 2 |
4 files changed, 54 insertions, 5 deletions
@@ -1,3 +1,17 @@ +2006-12-20 David Smith <dsmith@redhat.com> + + PR 3519. + * Makefile.am: Added 'examples' directory to the 'EXTRA_DIST' + variable so that the examples directory will be added to the + distribution directory. Added variables 'SAMPLE_DEST_DIR' and + 'SAMPLE_SRC' and target 'dist-add-samples' to copy some of the + testsuite sample scripts to the examples directory when creating a + distribution directory. + * Makefile.in: Regenerated. + * systemtap.spec.in: Added 'examples' directory to the %doc list + so that the examples directory will be installed on a user's + system. + 2006-12-19 Frank Ch. Eigler <fche@redhat.com> PR 3522. diff --git a/Makefile.am b/Makefile.am index a5571eb8..ce3ab228 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,8 +71,26 @@ LDADD = EXTRA_DIST = buildrun.h elaborate.h loc2c.h session.h \ parse.h staptree.h tapsets.h translate.h \ cache.h hash.h mdfour.h util.h \ - testsuite systemtap.spec runtime tapset -dist-hook: + examples testsuite systemtap.spec runtime tapset + +SAMPLE_DEST_DIR = $(distdir)/examples/samples + +SAMPLE_SRC = $(distdir)/testsuite/systemtap.samples/iotask.stp \ + $(distdir)/testsuite/systemtap.samples/kmalloc-stacks.stp \ + $(distdir)/testsuite/systemtap.samples/kmalloc-top \ + $(distdir)/testsuite/systemtap.samples/pfaults.stp \ + $(distdir)/testsuite/systemtap.samples/profile.stp \ + $(distdir)/testsuite/systemtap.samples/tcp_connections.stp \ + $(distdir)/testsuite/systemtap.samples/topsys.stp + +# Copy some of the testsuite sample scripts to the distdir +# 'examples/samples' directory. +dist-add-samples: $(SAMPLE_SRC) + rm -rf $(SAMPLE_DEST_DIR) + mkdir -p $(SAMPLE_DEST_DIR) + cp $(SAMPLE_SRC) $(SAMPLE_DEST_DIR) + +dist-hook: dist-add-samples find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf find $(distdir) -name 'stap' -o -name '*.log' -o -name '*.sum' -o -name 'site.exp' | xargs rm -rf diff --git a/Makefile.in b/Makefile.in index 6e9bd6cf..ddda1fee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -278,7 +278,16 @@ LDADD = EXTRA_DIST = buildrun.h elaborate.h loc2c.h session.h \ parse.h staptree.h tapsets.h translate.h \ cache.h hash.h mdfour.h util.h \ - testsuite systemtap.spec runtime tapset + examples testsuite systemtap.spec runtime tapset + +SAMPLE_DEST_DIR = $(distdir)/examples/samples +SAMPLE_SRC = $(distdir)/testsuite/systemtap.samples/iotask.stp \ + $(distdir)/testsuite/systemtap.samples/kmalloc-stacks.stp \ + $(distdir)/testsuite/systemtap.samples/kmalloc-top \ + $(distdir)/testsuite/systemtap.samples/pfaults.stp \ + $(distdir)/testsuite/systemtap.samples/profile.stp \ + $(distdir)/testsuite/systemtap.samples/tcp_connections.stp \ + $(distdir)/testsuite/systemtap.samples/topsys.stp TEST_COV_DIR = coverage SUBDIRS = testsuite $(am__append_4) @@ -1219,7 +1228,15 @@ uninstall-man: uninstall-man1 uninstall-man5 @BUILD_ELFUTILS_TRUE@ cp -df lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so* \ @BUILD_ELFUTILS_TRUE@ $(pkglibdir) @BUILD_ELFUTILS_TRUE@install-exec-local: install-elfutils -dist-hook: + +# Copy some of the testsuite sample scripts to the distdir +# 'examples/samples' directory. +dist-add-samples: $(SAMPLE_SRC) + rm -rf $(SAMPLE_DEST_DIR) + mkdir -p $(SAMPLE_DEST_DIR) + cp $(SAMPLE_SRC) $(SAMPLE_DEST_DIR) + +dist-hook: dist-add-samples find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf find $(distdir) -name 'stap' -o -name '*.log' -o -name '*.sum' -o -name 'site.exp' | xargs rm -rf diff --git a/systemtap.spec.in b/systemtap.spec.in index fc149796..62965700 100644 --- a/systemtap.spec.in +++ b/systemtap.spec.in @@ -120,7 +120,7 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc README AUTHORS NEWS COPYING +%doc README AUTHORS NEWS COPYING examples %{_bindir}/stap %{_bindir}/lket-b2a |