From 940b7aa56b9c2e371d8a00c6e179ab2e9b4268ba Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 7 Aug 2008 16:50:21 +0200 Subject: Add example indexes generation build machinery. --- Makefile.in | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index e3b6f146..3f978367 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -347,7 +347,11 @@ EXAMPLE_SRC = $(EXAMPLE_SOURCE_DIR)/ChangeLog \ $(EXAMPLE_SOURCE_DIR)/README \ $(EXAMPLE_SOURCE_DIR)/*.stp \ $(EXAMPLE_SOURCE_DIR)/*.txt \ - $(EXAMPLE_SOURCE_DIR)/*.meta + $(EXAMPLE_SOURCE_DIR)/*.meta \ + $(EXAMPLE_SOURCE_DIR)/*.html \ + $(EXAMPLE_SOURCE_DIR)/*.css \ + $(EXAMPLE_SOURCE_DIR)/*.gif \ + $(EXAMPLE_SOURCE_DIR)/*.png DEMO_SRC = \ $(EXAMPLE_SOURCE_DIR)/small_demos/*.stp \ @@ -362,6 +366,14 @@ SAMPLE_SRC = $(SAMPLE_SOURCE_DIR)/iotask.stp \ $(SAMPLE_SOURCE_DIR)/tcp_connections.stp \ $(SAMPLE_SOURCE_DIR)/topsys.stp +EXAMPLE_INDEXES = \ + $(EXAMPLE_SOURCE_DIR)/index.txt \ + $(EXAMPLE_SOURCE_DIR)/index.html \ + $(EXAMPLE_SOURCE_DIR)/subsystem-index.txt \ + $(EXAMPLE_SOURCE_DIR)/subsystem-index.html \ + $(EXAMPLE_SOURCE_DIR)/keyword-index.txt \ + $(EXAMPLE_SOURCE_DIR)/keyword-index.html + TEST_COV_DIR = coverage # XXX: leaves behind man pages SUBDIRS = testsuite doc @@ -1187,8 +1199,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1213,8 +1225,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1224,13 +1236,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1303,6 +1314,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -1330,6 +1345,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -1391,7 +1408,6 @@ distcleancheck: distclean check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -@BUILD_CRASHMOD_FALSE@all-local: all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) config.h all-local installdirs: installdirs-recursive installdirs-am: @@ -1499,7 +1515,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 clean-binPROGRAMS clean-generic clean-local \ clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -1570,12 +1586,18 @@ install-exec-hook: @BUILD_CRASHMOD_TRUE@$(STAPLOG): staplog.c @BUILD_CRASHMOD_TRUE@ $(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \ @BUILD_CRASHMOD_TRUE@ $(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $< -@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) +@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) example_index @BUILD_CRASHMOD_TRUE@install-exec-local: $(STAPLOG) @BUILD_CRASHMOD_TRUE@ $(MKDIR_P) $(DESTDIR)$(pkglibdir) @BUILD_CRASHMOD_TRUE@ $(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir) +@BUILD_CRASHMOD_FALSE@all-local: example_index + +example_index: $(EXAMPLE_SOURCE_DIR)/index.html + +$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_SOURCE_DIR)/*.meta + perl $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl $(EXAMPLE_SOURCE_DIR) -dist-hook: dist-gitversion +dist-hook: dist-gitversion example_index 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 @@ -1615,6 +1637,7 @@ clean-local: rm -rf $(TEST_COV_DIR) rm -rf stap.info rm -rf staplog.so + rm -rf $(EXAMPLE_INDEXES) uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir) -- cgit From 9b3f22a9b83c4fd5e66874d78f4d35ad742ff802 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 7 Aug 2008 16:30:20 -0400 Subject: simplify sample script installation logic --- Makefile.in | 83 ++++++++++++------------------------------------------------- 1 file changed, 16 insertions(+), 67 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3f978367..10dae8f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -337,43 +337,6 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server \ systemtap.spec -EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples -EXAMPLE_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples -DEMO_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples/small_demos -DEMO_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples/small_demos -SAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.samples -SAMPLE_INSTALL_DIR = $(EXAMPLE_INSTALL_DIR)/samples -EXAMPLE_SRC = $(EXAMPLE_SOURCE_DIR)/ChangeLog \ - $(EXAMPLE_SOURCE_DIR)/README \ - $(EXAMPLE_SOURCE_DIR)/*.stp \ - $(EXAMPLE_SOURCE_DIR)/*.txt \ - $(EXAMPLE_SOURCE_DIR)/*.meta \ - $(EXAMPLE_SOURCE_DIR)/*.html \ - $(EXAMPLE_SOURCE_DIR)/*.css \ - $(EXAMPLE_SOURCE_DIR)/*.gif \ - $(EXAMPLE_SOURCE_DIR)/*.png - -DEMO_SRC = \ - $(EXAMPLE_SOURCE_DIR)/small_demos/*.stp \ - $(EXAMPLE_SOURCE_DIR)/small_demos/*.txt \ - $(EXAMPLE_SOURCE_DIR)/small_demos/*.wav - -SAMPLE_SRC = $(SAMPLE_SOURCE_DIR)/iotask.stp \ - $(SAMPLE_SOURCE_DIR)/kmalloc-stacks.stp \ - $(SAMPLE_SOURCE_DIR)/kmalloc-top \ - $(SAMPLE_SOURCE_DIR)/pfaults.stp \ - $(SAMPLE_SOURCE_DIR)/profile.stp \ - $(SAMPLE_SOURCE_DIR)/tcp_connections.stp \ - $(SAMPLE_SOURCE_DIR)/topsys.stp - -EXAMPLE_INDEXES = \ - $(EXAMPLE_SOURCE_DIR)/index.txt \ - $(EXAMPLE_SOURCE_DIR)/index.html \ - $(EXAMPLE_SOURCE_DIR)/subsystem-index.txt \ - $(EXAMPLE_SOURCE_DIR)/subsystem-index.html \ - $(EXAMPLE_SOURCE_DIR)/keyword-index.txt \ - $(EXAMPLE_SOURCE_DIR)/keyword-index.html - TEST_COV_DIR = coverage # XXX: leaves behind man pages SUBDIRS = testsuite doc @@ -1199,8 +1162,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1225,8 +1188,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1236,12 +1199,13 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1314,10 +1278,6 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -1345,8 +1305,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -1408,6 +1366,7 @@ distcleancheck: distclean check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive +@BUILD_CRASHMOD_FALSE@all-local: all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) config.h all-local installdirs: installdirs-recursive installdirs-am: @@ -1515,7 +1474,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 clean-binPROGRAMS clean-generic clean-local \ clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -1586,18 +1545,12 @@ install-exec-hook: @BUILD_CRASHMOD_TRUE@$(STAPLOG): staplog.c @BUILD_CRASHMOD_TRUE@ $(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \ @BUILD_CRASHMOD_TRUE@ $(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $< -@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) example_index +@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) @BUILD_CRASHMOD_TRUE@install-exec-local: $(STAPLOG) @BUILD_CRASHMOD_TRUE@ $(MKDIR_P) $(DESTDIR)$(pkglibdir) @BUILD_CRASHMOD_TRUE@ $(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir) -@BUILD_CRASHMOD_FALSE@all-local: example_index - -example_index: $(EXAMPLE_SOURCE_DIR)/index.html - -$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_SOURCE_DIR)/*.meta - perl $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl $(EXAMPLE_SOURCE_DIR) -dist-hook: dist-gitversion example_index +dist-hook: dist-gitversion 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 @@ -1612,12 +1565,9 @@ install-data-local: do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/uprobes/$$f; done) (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) - $(MKDIR_P) $(EXAMPLE_INSTALL_DIR) - $(INSTALL_DATA) $(EXAMPLE_SRC) $(EXAMPLE_INSTALL_DIR) - $(MKDIR_P) $(DEMO_INSTALL_DIR) - $(INSTALL_DATA) $(DEMO_SRC) $(DEMO_INSTALL_DIR) - $(MKDIR_P) $(SAMPLE_INSTALL_DIR) - $(INSTALL_DATA) $(SAMPLE_SRC) $(SAMPLE_INSTALL_DIR) + (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ + | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \ + | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) gcov: @-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check @@ -1637,7 +1587,6 @@ clean-local: rm -rf $(TEST_COV_DIR) rm -rf stap.info rm -rf staplog.so - rm -rf $(EXAMPLE_INDEXES) uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir) -- cgit From 551a4f58263d6ce961658ba3b3d461c2f5046cb0 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 8 Aug 2008 13:29:55 +0200 Subject: Make sure examples indexes are always generated in builddir. --- Makefile.in | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 10dae8f1..45d209ac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -337,6 +337,10 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server \ systemtap.spec +EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples +EXAMPLE_BUILD_DIR = $(builddir)/testsuite/systemtap.examples +EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta +EXAMPLE_INDEX_GEN = $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl TEST_COV_DIR = coverage # XXX: leaves behind man pages SUBDIRS = testsuite doc @@ -1162,8 +1166,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1188,8 +1192,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1199,13 +1203,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1278,6 +1281,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -1305,6 +1312,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -1366,7 +1375,6 @@ distcleancheck: distclean check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -@BUILD_CRASHMOD_FALSE@all-local: all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) config.h all-local installdirs: installdirs-recursive installdirs-am: @@ -1474,7 +1482,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 clean-binPROGRAMS clean-generic clean-local \ clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -1545,10 +1553,16 @@ install-exec-hook: @BUILD_CRASHMOD_TRUE@$(STAPLOG): staplog.c @BUILD_CRASHMOD_TRUE@ $(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \ @BUILD_CRASHMOD_TRUE@ $(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $< -@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) +@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) example_index @BUILD_CRASHMOD_TRUE@install-exec-local: $(STAPLOG) @BUILD_CRASHMOD_TRUE@ $(MKDIR_P) $(DESTDIR)$(pkglibdir) @BUILD_CRASHMOD_TRUE@ $(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir) +@BUILD_CRASHMOD_FALSE@all-local: example_index + +example_index: $(EXAMPLE_BUILD_DIR)/index.html + +$(EXAMPLE_BUILD_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) + perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) $(EXAMPLE_BUILD_DIR) dist-hook: dist-gitversion find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf @@ -1565,7 +1579,7 @@ install-data-local: do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/uprobes/$$f; done) (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) - (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ + (cd $(builddir)/testsuite/systemtap.examples; find . -type f -print \ | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) -- cgit From ea757121c0710fe6fed14409c9d334f7f5e37efd Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 8 Aug 2008 16:20:05 +0200 Subject: Refer to srcdir spec file Makefile so make rpm works when builddir != srcdir. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 45d209ac..ee7e2758 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1672,7 +1672,7 @@ installcheck: fi rpm: systemtap.spec dist - rpmbuild --define "_sourcedir $(PWD)/" -ba systemtap.spec + rpmbuild --define "_sourcedir $(PWD)/" -ba $(srcdir)/systemtap.spec # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- cgit From 751f828801e9bd4739d03a31a77e84c91e075b4e Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 8 Aug 2008 17:11:53 +0200 Subject: Always generate examples indexes and install examples from srcdir. --- Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index ee7e2758..022ac831 100644 --- a/Makefile.in +++ b/Makefile.in @@ -338,7 +338,6 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ systemtap.spec EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples -EXAMPLE_BUILD_DIR = $(builddir)/testsuite/systemtap.examples EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta EXAMPLE_INDEX_GEN = $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl TEST_COV_DIR = coverage @@ -1559,10 +1558,10 @@ install-exec-hook: @BUILD_CRASHMOD_TRUE@ $(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir) @BUILD_CRASHMOD_FALSE@all-local: example_index -example_index: $(EXAMPLE_BUILD_DIR)/index.html +example_index: $(EXAMPLE_SOURCE_DIR)/index.html -$(EXAMPLE_BUILD_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) - perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) $(EXAMPLE_BUILD_DIR) +$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) + perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) dist-hook: dist-gitversion find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf @@ -1579,7 +1578,7 @@ install-data-local: do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/uprobes/$$f; done) (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) - (cd $(builddir)/testsuite/systemtap.examples; find . -type f -print \ + (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) -- cgit From d5658775da9fa0ac792eb3f874df9f7c4d60de7e Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Fri, 8 Aug 2008 15:11:36 -0400 Subject: Start/stop the systemtap server from systemtap.exp and not in the top level Makefile. --- Makefile.in | 42 +++--------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index e3b6f146..745205a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1636,28 +1636,9 @@ uninstall-local: check: SRCDIR=`cd $(srcdir); pwd`; \ - BUILDDIR=`cd $(builddir); pwd`; \ - need_server=0; \ - (echo "X$(EXTRA_TOOL_OPTS)" | grep -q server) && need_server=1; \ - if test $$need_server = 1; then \ - echo "Testing using a systemtap server"; \ - need_server=0; \ - server_pid=`stap-find-or-start-server` || need_server=1; \ - if test $$need_server = 1; then \ - echo "Cannot find or start a systemtap server"; \ - exit -1; \ - fi; \ - client_path="$$BUILDDIR/testsuite/net"; \ - mkdir -p $$BUILDDIR/testsuite/net; \ - cp -p $$SRCDIR/stap-client $$BUILDDIR/testsuite/net/stap; \ - fi; \ - $(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH="$$client_path:$(PWD)" RUNTESTFLAGS="$(RUNTESTFLAGS)"; \ - if test "X$$server_pid" != "X"; then \ - stap-stop-server $$server_pid; \ - fi + $(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH="$(PWD)" RUNTESTFLAGS="$(RUNTESTFLAGS)"; installcheck: - BUILDDIR=`cd $(builddir); pwd`; \ if test \! -e $(DESTDIR)$(bindir)/stap; then \ echo $(DESTDIR)$(bindir)/stap doesn\'t exist, run make install; \ exit -1; \ @@ -1665,25 +1646,8 @@ installcheck: if test $(builddir)/stap -nt $(DESTDIR)$(bindir)/stap; then \ echo "$(DESTDIR)$(bindir)/stap is not recent, run make install"; \ exit -1; \ - fi; \ - need_server=0; \ - (echo "X$(EXTRA_TOOL_OPTS)" | grep -q server) && need_server=1; \ - if test $$need_server = 1; then \ - echo "Testing using a systemtap server"; \ - need_server=0; \ - server_pid=`stap-find-or-start-server` || need_server=1; \ - if test $$need_server = 1; then \ - echo "Cannot find or start a systemtap server"; \ - exit -1; \ - fi; \ - client_path=":$$BUILDDIR/testsuite/net"; \ - mkdir -p $$BUILDDIR/testsuite/net; \ - cp -p $(DESTDIR)$(bindir)/stap-client $$BUILDDIR/testsuite/net/stap; \ - fi; \ - $(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" EXTRA_SYSTEMTAP_PATH="$(EXTRA_SYSTEMTAP_PATH)$$client_path"; \ - if test "X$$server_pid" != "X"; then \ - stap-stop-server $$server_pid; \ - fi + fi; + $(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" EXTRA_SYSTEMTAP_PATH="$(EXTRA_SYSTEMTAP_PATH)" rpm: systemtap.spec dist rpmbuild --define "_sourcedir $(PWD)/" -ba systemtap.spec -- cgit From 59ec94081d98239429a440c51744cd90db1d60d7 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sat, 9 Aug 2008 10:44:48 -0400 Subject: example index: only warn if old, do not regenerate --- Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 42d2afb9..1395fcab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -339,7 +339,6 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \ EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta -EXAMPLE_INDEX_GEN = $(EXAMPLE_SOURCE_DIR)/examples-index-gen.pl TEST_COV_DIR = coverage # XXX: leaves behind man pages SUBDIRS = testsuite doc @@ -1561,7 +1560,10 @@ install-exec-hook: example_index: $(EXAMPLE_SOURCE_DIR)/index.html $(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN) - perl $(EXAMPLE_INDEX_GEN) $(EXAMPLE_SOURCE_DIR) + @echo "The script example index is outdated, run" + @echo " cd $(EXAMPLE_SOURCE_DIR) && \\ " + @echo " perl examples-index-gen.pl" + @echo "to regenerate it." dist-hook: dist-gitversion find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf -- cgit From 5b8561dccfd6d79184c044cec6bd7d01ef415acc Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 11 Aug 2008 12:11:26 +0200 Subject: Use INSTALL_PROGRAM, not INSTALL_DATA for executable .stp scripts. --- Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 1395fcab..4ed771e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1582,7 +1582,10 @@ install-data-local: | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \ - | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) + | while read f; do if test -x $$f; then \ + i_cmd="$(INSTALL_PROGRAM)"; else \ + i_cmd="$(INSTALL_DATA)"; fi; \ + $$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) gcov: @-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check -- cgit