Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	ChangeLog
	Makefile.am
	Makefile.in
	testsuite/ChangeLog

2 files changed, 40 insertions, 25 deletions

diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am
index 71f2cd55..9e7d2069 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.am
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am
@@ -18,19 +18,26 @@ noinst_PROGRAMS = docproc
 SRCTREE=$(abs_top_srcdir)/
 DOCPROC=$(abs_builddir)/docproc
 
-if BUILD_DOCS
-all: pdfdocs htmldocs mandocs
-xmldocs: docproc
-	SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml
-
-htmldocs: xmldocs
+if BUILD_REFDOCS
+all: tapsets.pdf stamp-htmldocs stamp-mandocs
+tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp')
+	SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new
+	if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \
+		echo tapsets.xml unchanged; \
+	else \
+		mv tapsets.xml.new tapsets.xml; \
+	fi
+
+stamp-htmldocs: tapsets.xml
 	xmlto html -o tapsets tapsets.xml
+	touch stamp-htmldocs
 
-pdfdocs: xmldocs
+tapsets.pdf: tapsets.xml
 	xmlto pdf tapsets.xml
 
-mandocs: xmldocs
+stamp-mandocs: tapsets.xml
 	xmlto man -o man5 tapsets.xml
+	touch stamp-mandocs
 
 #FIXME need to figure out where to install things appropriately
 #installmandocs: mandocs
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index 839c6672..f840d8c5 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -137,6 +137,7 @@ have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
 have_ps2pdf = @have_ps2pdf@
+have_xmlto = @have_xmlto@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@
@@ -337,7 +338,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@BUILD_DOCS_FALSE@install-data-hook:
+@BUILD_REFDOCS_FALSE@install-data-hook:
 clean: clean-am
 
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
@@ -413,28 +414,35 @@ uninstall-am:
 	uninstall-am
 
 
-@BUILD_DOCS_TRUE@all: pdfdocs htmldocs mandocs
-@BUILD_DOCS_TRUE@xmldocs: docproc
-@BUILD_DOCS_TRUE@	SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml
+@BUILD_REFDOCS_TRUE@all: tapsets.pdf stamp-htmldocs stamp-mandocs
+@BUILD_REFDOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp')
+@BUILD_REFDOCS_TRUE@	SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new
+@BUILD_REFDOCS_TRUE@	if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \
+@BUILD_REFDOCS_TRUE@		echo tapsets.xml unchanged; \
+@BUILD_REFDOCS_TRUE@	else \
+@BUILD_REFDOCS_TRUE@		mv tapsets.xml.new tapsets.xml; \
+@BUILD_REFDOCS_TRUE@	fi
 
-@BUILD_DOCS_TRUE@htmldocs: xmldocs
-@BUILD_DOCS_TRUE@	xmlto html -o tapsets tapsets.xml
+@BUILD_REFDOCS_TRUE@stamp-htmldocs: tapsets.xml
+@BUILD_REFDOCS_TRUE@	xmlto html -o tapsets tapsets.xml
+@BUILD_REFDOCS_TRUE@	touch stamp-htmldocs
 
-@BUILD_DOCS_TRUE@pdfdocs: xmldocs
-@BUILD_DOCS_TRUE@	xmlto pdf tapsets.xml
+@BUILD_REFDOCS_TRUE@tapsets.pdf: tapsets.xml
+@BUILD_REFDOCS_TRUE@	xmlto pdf tapsets.xml
 
-@BUILD_DOCS_TRUE@mandocs: xmldocs
-@BUILD_DOCS_TRUE@	xmlto man -o man5 tapsets.xml
+@BUILD_REFDOCS_TRUE@stamp-mandocs: tapsets.xml
+@BUILD_REFDOCS_TRUE@	xmlto man -o man5 tapsets.xml
+@BUILD_REFDOCS_TRUE@	touch stamp-mandocs
 
 #FIXME need to figure out where to install things appropriately
 #installmandocs: mandocs
-@BUILD_DOCS_TRUE@install-data-hook:
-@BUILD_DOCS_TRUE@	$(MKDIR_P)  $(DOC_INSTALL_DIR)
-@BUILD_DOCS_TRUE@	$(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR)
-@BUILD_DOCS_TRUE@	$(MKDIR_P)  $(MAN_INSTALL_DIR)
-@BUILD_DOCS_TRUE@	$(INSTALL_DATA) man5/* $(MAN_INSTALL_DIR)
-@BUILD_DOCS_TRUE@	$(MKDIR_P)  $(HTML_INSTALL_DIR)
-@BUILD_DOCS_TRUE@	$(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@install-data-hook:
+@BUILD_REFDOCS_TRUE@	$(MKDIR_P)  $(DOC_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@	$(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@	$(MKDIR_P)  $(MAN_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@	$(INSTALL_DATA) man5/* $(MAN_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@	$(MKDIR_P)  $(HTML_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@	$(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR)
 # 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: