From cd3891cba6326df5ecfe4067f80e86390c759303 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Wed, 18 Mar 2009 16:19:33 -0400 Subject: Put man pages from tapset in 3stap (PR9870). --- doc/SystemTap_Tapset_Reference/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 9e7d2069..68dfd971 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -2,7 +2,7 @@ ## process this file with automake to produce Makefile.in DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap -MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man5 +MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3stap HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets @@ -36,7 +36,7 @@ tapsets.pdf: tapsets.xml xmlto pdf tapsets.xml stamp-mandocs: tapsets.xml - xmlto man -o man5 tapsets.xml + xmlto man -o man3stap tapsets.xml touch stamp-mandocs #FIXME need to figure out where to install things appropriately @@ -45,7 +45,7 @@ install-data-hook: $(MKDIR_P) $(DOC_INSTALL_DIR) $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) $(MKDIR_P) $(MAN_INSTALL_DIR) - $(INSTALL_DATA) man5/* $(MAN_INSTALL_DIR) + $(INSTALL_DATA) man3stap/* $(MAN_INSTALL_DIR) $(MKDIR_P) $(HTML_INSTALL_DIR) $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR) endif -- cgit From d9e3e39eef31587ea762f4b017b46495f7a0b70f Mon Sep 17 00:00:00 2001 From: William Cohen Date: Tue, 24 Mar 2009 11:16:38 -0400 Subject: Move tapset documentation manpages from man3stap to man3. --- doc/SystemTap_Tapset_Reference/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 68dfd971..b21bfcd6 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -2,7 +2,7 @@ ## process this file with automake to produce Makefile.in DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap -MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3stap +MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3 HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets @@ -36,7 +36,7 @@ tapsets.pdf: tapsets.xml xmlto pdf tapsets.xml stamp-mandocs: tapsets.xml - xmlto man -o man3stap tapsets.xml + xmlto man -o man3 tapsets.xml touch stamp-mandocs #FIXME need to figure out where to install things appropriately @@ -45,7 +45,7 @@ install-data-hook: $(MKDIR_P) $(DOC_INSTALL_DIR) $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) $(MKDIR_P) $(MAN_INSTALL_DIR) - $(INSTALL_DATA) man3stap/* $(MAN_INSTALL_DIR) + $(INSTALL_DATA) man3/* $(MAN_INSTALL_DIR) $(MKDIR_P) $(HTML_INSTALL_DIR) $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR) endif -- cgit From 1e0a708d560ed69405e94a45d11067abae7f79a5 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Thu, 23 Apr 2009 11:12:51 -0400 Subject: Bump pool_size and hash_size to build Systemtap Tapset Refence manual. --- doc/SystemTap_Tapset_Reference/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index b21bfcd6..087ca887 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -32,7 +32,10 @@ stamp-htmldocs: tapsets.xml xmlto html -o tapsets tapsets.xml touch stamp-htmldocs +# bump up the allocated space so "xmlto pdf" works tapsets.pdf: tapsets.xml + export pool_size=2000000 + export hash_size=120000 xmlto pdf tapsets.xml stamp-mandocs: tapsets.xml -- cgit From 52bc8b53c4bf03d51edf02d088aa04af809b9005 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Thu, 23 Apr 2009 15:04:05 -0400 Subject: Make sure that the pool_size and hash_size are passed into xmlto. --- doc/SystemTap_Tapset_Reference/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 087ca887..4dc48822 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -34,9 +34,7 @@ stamp-htmldocs: tapsets.xml # bump up the allocated space so "xmlto pdf" works tapsets.pdf: tapsets.xml - export pool_size=2000000 - export hash_size=120000 - xmlto pdf tapsets.xml + env pool_size=2000000 hash_size=120000 xmlto pdf tapsets.xml stamp-mandocs: tapsets.xml xmlto man -o man3 tapsets.xml -- cgit From fd8646cc285b96601bf5602d7c669d09b0344c13 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Thu, 23 Apr 2009 15:26:32 -0400 Subject: Revert "Make sure that the pool_size and hash_size are passed into xmlto." This reverts commit 52bc8b53c4bf03d51edf02d088aa04af809b9005. --- doc/SystemTap_Tapset_Reference/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 4dc48822..087ca887 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -34,7 +34,9 @@ stamp-htmldocs: tapsets.xml # bump up the allocated space so "xmlto pdf" works tapsets.pdf: tapsets.xml - env pool_size=2000000 hash_size=120000 xmlto pdf tapsets.xml + export pool_size=2000000 + export hash_size=120000 + xmlto pdf tapsets.xml stamp-mandocs: tapsets.xml xmlto man -o man3 tapsets.xml -- cgit From 551218c441e28128d458c4fbd4923335800ea878 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Thu, 23 Apr 2009 15:37:22 -0400 Subject: Make sure values get passed to xmlto. --- doc/SystemTap_Tapset_Reference/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 087ca887..7903b12b 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -34,9 +34,7 @@ stamp-htmldocs: tapsets.xml # bump up the allocated space so "xmlto pdf" works tapsets.pdf: tapsets.xml - export pool_size=2000000 - export hash_size=120000 - xmlto pdf tapsets.xml + env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml stamp-mandocs: tapsets.xml xmlto man -o man3 tapsets.xml -- cgit From 3cfd791d8fd3842ef55ef54657a70e0bc4225d0c Mon Sep 17 00:00:00 2001 From: Eugeniy Meshcheryakov Date: Tue, 5 May 2009 23:14:54 +0200 Subject: Only disable building of PDF version of refdocs if xmlto is bad --- doc/SystemTap_Tapset_Reference/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 7903b12b..276c7169 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -19,7 +19,11 @@ SRCTREE=$(abs_top_srcdir)/ DOCPROC=$(abs_builddir)/docproc if BUILD_REFDOCS -all: tapsets.pdf stamp-htmldocs stamp-mandocs +PDFDOCS = tapsets.pdf +endif + +if BUILD_DOCS +all: $(PDFDOCS) 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 \ @@ -43,8 +47,10 @@ stamp-mandocs: tapsets.xml #FIXME need to figure out where to install things appropriately #installmandocs: mandocs install-data-hook: +if BUILD_REFDOCS $(MKDIR_P) $(DOC_INSTALL_DIR) $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) +endif $(MKDIR_P) $(MAN_INSTALL_DIR) $(INSTALL_DATA) man3/* $(MAN_INSTALL_DIR) $(MKDIR_P) $(HTML_INSTALL_DIR) -- cgit From 023337aaca2d3056437658e3037840b05d3d9a75 Mon Sep 17 00:00:00 2001 From: Eugeniy Meshcheryakov Date: Wed, 6 May 2009 01:04:38 +0200 Subject: Fix --enable-refdocs --- doc/SystemTap_Tapset_Reference/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 276c7169..a191461a 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -18,11 +18,11 @@ noinst_PROGRAMS = docproc SRCTREE=$(abs_top_srcdir)/ DOCPROC=$(abs_builddir)/docproc -if BUILD_REFDOCS +if BUILD_PDFREFDOCS PDFDOCS = tapsets.pdf endif -if BUILD_DOCS +if BUILD_REFDOCS all: $(PDFDOCS) stamp-htmldocs stamp-mandocs tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp') SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new @@ -47,7 +47,7 @@ stamp-mandocs: tapsets.xml #FIXME need to figure out where to install things appropriately #installmandocs: mandocs install-data-hook: -if BUILD_REFDOCS +if BUILD_PDFREFDOCS $(MKDIR_P) $(DOC_INSTALL_DIR) $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) endif -- cgit From 532a25e60429f12cb92ef1056f1454815d135322 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 8 May 2009 10:30:41 +0200 Subject: Search for only under $(SRCDIR)/tapsets for tapsets.xml and cleanup. * doc/SystemTap_Tapset_Reference/Makefile.am (tapsets.xml): Only search under $(SRCDIR)/tapsets for .stp files. Cleanup tapsets.xml.new. * doc/SystemTap_Tapset_Reference/Makefile.in: Regenerated. --- doc/SystemTap_Tapset_Reference/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/SystemTap_Tapset_Reference/Makefile.am') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index a191461a..30c4ffef 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -24,10 +24,11 @@ endif if BUILD_REFDOCS all: $(PDFDOCS) stamp-htmldocs stamp-mandocs -tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp') +tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -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; \ + rm tapsets.xml.new; \ else \ mv tapsets.xml.new tapsets.xml; \ fi -- cgit