summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mwielaard@redhat.com>2008-08-07 16:50:21 +0200
committerMark Wielaard <mwielaard@redhat.com>2008-08-07 16:50:21 +0200
commit940b7aa56b9c2e371d8a00c6e179ab2e9b4268ba (patch)
treeb69a06d660ef403d538e8200253d048e0ec1eae0
parentc256c4a6d2c9d9039924ef5fcdcbf4e802ed19c9 (diff)
downloadsystemtap-steved-940b7aa56b9c2e371d8a00c6e179ab2e9b4268ba.tar.gz
systemtap-steved-940b7aa56b9c2e371d8a00c6e179ab2e9b4268ba.tar.xz
systemtap-steved-940b7aa56b9c2e371d8a00c6e179ab2e9b4268ba.zip
Add example indexes generation build machinery.
-rw-r--r--ChangeLog10
-rw-r--r--Makefile.am26
-rw-r--r--Makefile.in51
3 files changed, 70 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 470cdda4..241409d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2008-08-07 Mark Wielaard <mwielaard@redhat.com>
+ * Makefile.am (all-local): Add example_index.
+ (dist-hook): Likewise.
+ (EXAMPLE_SRC): Add index and support files.
+ (EXAMPLE_INDEXES): New file list.
+ (example_index): New target.
+ (clean-local): Remove generated indexes.
+ * Makefile.in: Regenerated.
+
+2008-08-07 Mark Wielaard <mwielaard@redhat.com>
+
* systemtap.spec: Add comment about versioned vs unversioned docs.
2008-08-06 Frank Ch. Eigler <fche@elastic.org>
diff --git a/Makefile.am b/Makefile.am
index eaddfd59..d5dde8f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,10 +140,12 @@ STAPLOG=staplog.so
$(STAPLOG): staplog.c
$(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \
$(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $<
-all-local: $(STAPLOG)
+all-local: $(STAPLOG) example_index
install-exec-local: $(STAPLOG)
$(MKDIR_P) $(DESTDIR)$(pkglibdir)
$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
+else
+all-local: example_index
endif
# Get extra libs as needed
@@ -169,7 +171,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 \
@@ -184,7 +190,20 @@ SAMPLE_SRC = $(SAMPLE_SOURCE_DIR)/iotask.stp \
$(SAMPLE_SOURCE_DIR)/tcp_connections.stp \
$(SAMPLE_SOURCE_DIR)/topsys.stp
-dist-hook: dist-gitversion
+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
+
+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
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
@@ -226,6 +245,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)
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)