From 8697ba53e62f10cbf8c328461465a6e6ac86ae53 Mon Sep 17 00:00:00 2001 From: Eugeniy Meshcheryakov Date: Tue, 5 May 2009 22:53:49 +0200 Subject: Run autoreconf --- doc/SystemTap_Tapset_Reference/Makefile.in | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index de4683a3..85d49939 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 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. @@ -46,7 +46,7 @@ PROGRAMS = $(noinst_PROGRAMS) docproc_SOURCES = docproc.c docproc_OBJECTS = docproc.$(OBJEXT) docproc_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -139,7 +139,6 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ -have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ have_xmlto = @have_xmlto@ host_alias = @host_alias@ @@ -169,6 +168,7 @@ staplog_CPPFLAGS = @staplog_CPPFLAGS@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap @@ -184,8 +184,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -243,8 +243,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; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -256,8 +256,8 @@ TAGS: $(HEADERS) $(SOURCES) $(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) \ @@ -267,13 +267,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(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 -- 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') 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 98143ce2f074245cbf6440a3da5451ce4bef47f2 Mon Sep 17 00:00:00 2001 From: Eugeniy Meshcheryakov Date: Tue, 5 May 2009 23:26:24 +0200 Subject: Run autoreconf --- doc/SystemTap_Tapset_Reference/Makefile.in | 49 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index 85d49939..b5665628 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -176,6 +176,7 @@ MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3 HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets SRCTREE = $(abs_top_srcdir)/ DOCPROC = $(abs_builddir)/docproc +@BUILD_REFDOCS_TRUE@PDFDOCS = tapsets.pdf all: all-am .SUFFIXES: @@ -339,7 +340,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_REFDOCS_FALSE@install-data-hook: +@BUILD_DOCS_FALSE@install-data-hook: clean: clean-am clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am @@ -415,36 +416,36 @@ uninstall-am: uninstall-am -@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@all: $(PDFDOCS) stamp-htmldocs stamp-mandocs +@BUILD_DOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp') +@BUILD_DOCS_TRUE@ SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new +@BUILD_DOCS_TRUE@ if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \ +@BUILD_DOCS_TRUE@ echo tapsets.xml unchanged; \ +@BUILD_DOCS_TRUE@ else \ +@BUILD_DOCS_TRUE@ mv tapsets.xml.new tapsets.xml; \ +@BUILD_DOCS_TRUE@ fi -@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@stamp-htmldocs: tapsets.xml +@BUILD_DOCS_TRUE@ xmlto html -o tapsets tapsets.xml +@BUILD_DOCS_TRUE@ touch stamp-htmldocs # bump up the allocated space so "xmlto pdf" works -@BUILD_REFDOCS_TRUE@tapsets.pdf: tapsets.xml -@BUILD_REFDOCS_TRUE@ env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml +@BUILD_DOCS_TRUE@tapsets.pdf: tapsets.xml +@BUILD_DOCS_TRUE@ env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml -@BUILD_REFDOCS_TRUE@stamp-mandocs: tapsets.xml -@BUILD_REFDOCS_TRUE@ xmlto man -o man3 tapsets.xml -@BUILD_REFDOCS_TRUE@ touch stamp-mandocs +@BUILD_DOCS_TRUE@stamp-mandocs: tapsets.xml +@BUILD_DOCS_TRUE@ xmlto man -o man3 tapsets.xml +@BUILD_DOCS_TRUE@ touch stamp-mandocs #FIXME need to figure out where to install things appropriately #installmandocs: mandocs -@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) man3/* $(MAN_INSTALL_DIR) -@BUILD_REFDOCS_TRUE@ $(MKDIR_P) $(HTML_INSTALL_DIR) -@BUILD_REFDOCS_TRUE@ $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR) +@BUILD_DOCS_TRUE@install-data-hook: +@BUILD_DOCS_TRUE@@BUILD_REFDOCS_TRUE@ $(MKDIR_P) $(DOC_INSTALL_DIR) +@BUILD_DOCS_TRUE@@BUILD_REFDOCS_TRUE@ $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) +@BUILD_DOCS_TRUE@ $(MKDIR_P) $(MAN_INSTALL_DIR) +@BUILD_DOCS_TRUE@ $(INSTALL_DATA) man3/* $(MAN_INSTALL_DIR) +@BUILD_DOCS_TRUE@ $(MKDIR_P) $(HTML_INSTALL_DIR) +@BUILD_DOCS_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: -- 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') 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 ccf8bc85c08ba5602288caeb5062b3bf049a6960 Mon Sep 17 00:00:00 2001 From: Eugeniy Meshcheryakov Date: Wed, 6 May 2009 17:13:33 +0200 Subject: run autoreconf --- doc/SystemTap_Tapset_Reference/Makefile.in | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'doc/SystemTap_Tapset_Reference') diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index b5665628..705ddbae 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -176,7 +176,7 @@ MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3 HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets SRCTREE = $(abs_top_srcdir)/ DOCPROC = $(abs_builddir)/docproc -@BUILD_REFDOCS_TRUE@PDFDOCS = tapsets.pdf +@BUILD_PDFREFDOCS_TRUE@PDFDOCS = tapsets.pdf all: all-am .SUFFIXES: @@ -340,7 +340,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 @@ -416,36 +416,36 @@ uninstall-am: uninstall-am -@BUILD_DOCS_TRUE@all: $(PDFDOCS) stamp-htmldocs stamp-mandocs -@BUILD_DOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp') -@BUILD_DOCS_TRUE@ SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new -@BUILD_DOCS_TRUE@ if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \ -@BUILD_DOCS_TRUE@ echo tapsets.xml unchanged; \ -@BUILD_DOCS_TRUE@ else \ -@BUILD_DOCS_TRUE@ mv tapsets.xml.new tapsets.xml; \ -@BUILD_DOCS_TRUE@ fi +@BUILD_REFDOCS_TRUE@all: $(PDFDOCS) 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@stamp-htmldocs: tapsets.xml -@BUILD_DOCS_TRUE@ xmlto html -o tapsets tapsets.xml -@BUILD_DOCS_TRUE@ touch stamp-htmldocs +@BUILD_REFDOCS_TRUE@stamp-htmldocs: tapsets.xml +@BUILD_REFDOCS_TRUE@ xmlto html -o tapsets tapsets.xml +@BUILD_REFDOCS_TRUE@ touch stamp-htmldocs # bump up the allocated space so "xmlto pdf" works -@BUILD_DOCS_TRUE@tapsets.pdf: tapsets.xml -@BUILD_DOCS_TRUE@ env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml +@BUILD_REFDOCS_TRUE@tapsets.pdf: tapsets.xml +@BUILD_REFDOCS_TRUE@ env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml -@BUILD_DOCS_TRUE@stamp-mandocs: tapsets.xml -@BUILD_DOCS_TRUE@ xmlto man -o man3 tapsets.xml -@BUILD_DOCS_TRUE@ touch stamp-mandocs +@BUILD_REFDOCS_TRUE@stamp-mandocs: tapsets.xml +@BUILD_REFDOCS_TRUE@ xmlto man -o man3 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@@BUILD_REFDOCS_TRUE@ $(MKDIR_P) $(DOC_INSTALL_DIR) -@BUILD_DOCS_TRUE@@BUILD_REFDOCS_TRUE@ $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) -@BUILD_DOCS_TRUE@ $(MKDIR_P) $(MAN_INSTALL_DIR) -@BUILD_DOCS_TRUE@ $(INSTALL_DATA) man3/* $(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_PDFREFDOCS_TRUE@@BUILD_REFDOCS_TRUE@ $(MKDIR_P) $(DOC_INSTALL_DIR) +@BUILD_PDFREFDOCS_TRUE@@BUILD_REFDOCS_TRUE@ $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR) +@BUILD_REFDOCS_TRUE@ $(MKDIR_P) $(MAN_INSTALL_DIR) +@BUILD_REFDOCS_TRUE@ $(INSTALL_DATA) man3/* $(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: -- cgit