[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 2f06d35978783145c42d6eeee6e63e63bd40a77d

[code]

revision:            2f06d35978783145c42d6eeee6e63e63bd40a77d
date:                2011-01-31T19:02:22
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.source-tree-cleanup
changelog:
Because there are some tools that don't deal well with building docs
in a subdirectory (notably, automake doesn't treat this well), it's simpler
to have a doc-specific Makefile.am.

Because doc/monotone.texi needs to know where to find std_hooks.lua, have
it include monotonevars.texi, which we generate from doc/Makefile.

manifest:
format_version "1"

new_manifest [df57025ac192e5e7ba31cf64a99bfd8729120e80]

old_revision [832ace38fc640ba36b298f608a2b4a1e03fdf8e2]

add_file "doc/Makefile.am"
 content [651ebd77b18e1368029b4d1b326cd9ec38e78092]

patch "Makefile.am"
 from [1952fa490528674627aabf1f00ff00c820614b9b]
   to [7e719f1909084a3a8a1096de757ea4854a223127]

patch "configure.ac"
 from [2698872ba385d9450b5b9d26de64e697f59ee2e9]
   to [8a0cadde1c1a91ffb79b4b5263c17e2471193585]

patch "doc/monotone.texi"
 from [646fd606b40d01d278921bce784da2fc5a0dabb8]
   to [ead09e29daabf7bc4bc3c8b2919371d69116b7ed]
============================================================
--- Makefile.am	1952fa490528674627aabf1f00ff00c820614b9b
+++ Makefile.am	7e719f1909084a3a8a1096de757ea4854a223127
@@ -327,31 +327,6 @@ endif
 
 # extra files
 
-PDF_FIGURES= doc/figures/branch-heads.pdf doc/figures/cert.pdf			\
-	doc/figures/difference-between-versions.pdf				\
-	doc/figures/file-id-manifest-id.pdf doc/figures/fork.pdf		\
-	doc/figures/general-workflow.pdf doc/figures/linear-history.pdf		\
-	doc/figures/local-workflow.pdf doc/figures/manifest.pdf			\
-	doc/figures/merge.pdf doc/figures/network-workflow.pdf			\
-	doc/figures/parent-child-hashes.pdf					\
-	doc/figures/parent-child-names-hashes.pdf doc/figures/parent-child.pdf	\
-	doc/figures/revision-chaining.pdf doc/figures/revision.pdf		\
-	doc/figures/statement.pdf doc/figures/three-versions.pdf		\
-	doc/figures/two-branches.pdf
-
-PNG_IMAGES= doc/images/bg.png doc/images/go-next.png			\
-	doc/images/go-previous.png doc/images/go-up.png			\
-	doc/images/toc.png
-
-PNG_FIGURES=$(PDF_FIGURES:.pdf=.png)
-EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
-TEXI_FRAGMENTS = doc/pcrepattern.texi doc/pcresyntax.texi
-
-man1_MANS = mtn.1
-info_TEXINFOS = doc/monotone.texi
-
-doc_monotone_TEXINFOS = src/std_hooks.lua $(TEXI_FRAGMENTS)
-
 EXTRA_DIST =								\
 	HACKING INSTALL INSTALL_windows_cygwin.txt			\
 	INSTALL_windows_native.txt README.visualc8 UPGRADE		\
@@ -362,10 +337,6 @@ EXTRA_DIST =								\
 	src/win32/monotone.iss.in src/win32/modpath.iss 		\
 	src/win32/monotone.bmp src/win32/dlls.sh			\
 									\
-	$(PDF_FIGURES) $(PNG_FIGURES) $(TEXI_FRAGMENTS)			\
-	doc/figures/monotone-logo.svg doc/figures/oo-figures.sxd	\
-	doc/figures/pdfcrop.pl doc/figures/README			\
-									\
 	src/std_hooks.lua						\
 	test/func test/func-testsuite.lua				\
 	test/tester test/tester-testsuite.lua				\
@@ -379,67 +350,6 @@ EXTRA_DIST =								\
 									\
 	contrib examples mac notes visualc
 
-AM_MAKEINFOFLAGS= -I $(srcdir)
-
-AM_MAKEINFOHTMLFLAGS= -I $(srcdir) \
-	--number-sections --no-split --no-headers --css-ref=texinfo.css
-
-# Html and pdf dependencies are simply copied.
-# All other are generated with the rules further down.
-copy-html-deps: doc/texinfo.css $(PNG_FIGURES) $(PNG_IMAGES)
-	for f in doc/texinfo.css $(PNG_FIGURES) $(PNG_IMAGES); do \
-	    d=`dirname $$f`; \
-	    [ -d $$d ] || $(MKDIR_P) $$d && \
-		cmp -s $(srcdir)/$$f $(builddir)/$$f || \
-		    cp -v $(srcdir)/$$f $(builddir)/$$f; \
-	done
-
-copy-pdf-deps:  $(PDF_FIGURES)
-	for f in $(PDF_FIGURES); do \
-	    d=`dirname $$f`; \
-	    [ -d $$d ] || $(MKDIR_P) $$d && \
-		cmp -s $(srcdir)/$$f $(builddir)/$$f || \
-		    cp -v $(srcdir)/$$f $(builddir)/$$f; \
-	done
-
-#%.eps: %.epsi
-#	mv -f $< $@
-#
-#%.epsi: %.ps
-#	ps2epsi $< $@
-
-doc/figures/%.eps: doc/figures/%.ps
-	ps2eps <$< >$@
-
-doc/figures/%.ps: $(top_builddir)/doc/figures/%.pdf
-#	acroread -toPostScript -pairs $< $@
-	pdftops $< $@
-
-$(top_builddir)/doc/figures/%.pdf : $(srcdir)/doc/figures/%.pdf copy-pdf-deps
-
-# Stealing code from automake and adapting, we want a HTML file tree as well
-AM_MAKEINFODOCHTMLFLAGS= -I $(srcdir) \
-	--number-sections --css-ref=texinfo.css
-
-doc/html: doc/monotone.texi $(srcdir)/doc/version.texi $(doc_monotone_TEXINFOS) copy-html-deps doc/html/$(am__dirstamp)
-	$(MKDIR_P) address@hidden
-	cp -r $(srcdir)/doc/figures address@hidden
-	cp -r $(srcdir)/doc/images address@hidden
-	cp $(srcdir)/doc/texinfo.css address@hidden
-	if $(MAKEINFOHTML) $(AM_MAKEINFODOCHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
-	 -o address@hidden `test -f 'doc/monotone.texi' || echo '$(srcdir)/'`doc/monotone.texi; \
-	then \
-	  rm -rf $@; \
-	  mv address@hidden $@; \
-	else \
-	  rm -Rf address@hidden; \
-	  exit 1; \
-	fi
-html-local: doc/html
-doc/html/$(am__dirstamp):
-	@$(MKDIR_P) doc/html
-	@: > doc/$(am__dirstamp)
-
 # Message translation support
 # INST_LINGUAS is set by configure, based on the po/LINGUAS file and
 # the user's LINGUAS env. variable.  Additional settings are in
@@ -507,7 +417,7 @@ po/$(PACKAGE).pot: $(POTFILES)
 	  $(XGETTEXT_PKG_OPTS) $(XGETTEXT_OPTS) \
 	  $(POTFILES)
 
-dist-hook: $(ALL_GMOFILES) copy-html-deps copy-pdf-deps
+dist-hook: $(ALL_GMOFILES)
 	cp $(ALL_GMOFILES) $(distdir)/po
 # also, kill off any backup files that got pulled in by one of the
 # recursive subdirectory includes in EXTRA_DIST
@@ -814,6 +724,27 @@ mtn.1: mtn$(EXEEXT)
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
 	(cd $(srcdir) && $$REAL_BLDDIR/mtn manpage --norc) 2>/dev/null >$@ || rm -f $@
 
+
+info-local:
+	$(MKDIR_P) doc
+	cd doc; $(MAKE) info
+dvi-local doc/monotone.dvi:
+	$(MKDIR_P) doc
+	cd doc; $(MAKE) dvi
+pdf-local doc/monotone.pdf:
+	$(MKDIR_P) doc
+	cd doc; $(MAKE) pdf
+ps-local doc/monotone.ps:
+	$(MKDIR_P) doc
+	cd doc; $(MAKE) ps
+html-local doc/html doc/monotone.html:
+	$(MKDIR_P) doc
+	cd doc; $(MAKE) html
+.PHONY: pdf-local html-local dvi-local info-local ps-local
+# Not really phony, but the only way to make sure we wander into
+# the subdirectory and do the build with dependencies and all.
+.PHONY: doc/monotone.dvi doc/monotone.pdf doc/monotone.ps doc/monotone.html
+
 # Verbosity goo.
 V_bcxx       = $(V_bcxx_$(V))
 V_bcxx_      = $(V_bcxx_$(AM_DEFAULT_VERBOSITY))
============================================================
--- configure.ac	2698872ba385d9450b5b9d26de64e697f59ee2e9
+++ configure.ac	8a0cadde1c1a91ffb79b4b5263c17e2471193585
@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 no-dist-gzip std-options])
 AC_CONFIG_SRCDIR([src/app_state.cc])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile])
 AC_LANG([C++])
 
 dnl We want to take advantage of automake 1.11's optional "quiet build"
============================================================
--- doc/monotone.texi	646fd606b40d01d278921bce784da2fc5a0dabb8
+++ doc/monotone.texi	ead09e29daabf7bc4bc3c8b2919371d69116b7ed
@@ -12,6 +12,7 @@
 
 @syncodeindex fn cp
 @include version.texi
address@hidden monotonevars.texi
 
 @dircategory Programming
 @direntry
@@ -13214,7 +13215,7 @@ @appendix Default hooks
 hooks files (unless @option{--no-builtin-rcfiles} is passed).  It contains the
 default values for all hooks. See @ref{rcfiles}.
 
address@hidden src/std_hooks.lua
address@hidden @value{top_srcdir}/src/std_hooks.lua
 
 @node General Index,  , Default hooks, Top
 @unnumbered General Index
============================================================
--- /dev/null	
+++ doc/Makefile.am	651ebd77b18e1368029b4d1b326cd9ec38e78092
@@ -0,0 +1,137 @@
+# Copyright (C) 2011 Richard Levitte <address@hidden>
+#
+# This program is made available under the GNU GPL version 2.0 or
+# greater. See the accompanying file COPYING for details.
+#
+# This program is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.
+
+# Makefile for monotone
+
+AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
+ACLOCAL_AMFLAGS  = -I m4
+
+PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf			\
+	figures/difference-between-versions.pdf				\
+	figures/file-id-manifest-id.pdf figures/fork.pdf		\
+	figures/general-workflow.pdf figures/linear-history.pdf		\
+	figures/local-workflow.pdf figures/manifest.pdf			\
+	figures/merge.pdf figures/network-workflow.pdf			\
+	figures/parent-child-hashes.pdf					\
+	figures/parent-child-names-hashes.pdf figures/parent-child.pdf	\
+	figures/revision-chaining.pdf figures/revision.pdf		\
+	figures/statement.pdf figures/three-versions.pdf		\
+	figures/two-branches.pdf
+
+PNG_IMAGES= images/bg.png images/go-next.png			\
+	images/go-previous.png images/go-up.png			\
+	images/toc.png
+
+PNG_FIGURES=$(PDF_FIGURES:.pdf=.png)
+EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
+
+# See the rules further down that does the work.
+PDF_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PDF_FIGURES))
+PNG_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PNG_FIGURES))
+PNG_IMAGES_copied = $(addprefix $(abs_builddir)/,$(PNG_IMAGES))
+EPS_FIGURES_generated = $(addprefix $(abs_builddir)/,$(EPS_FIGURES))
+HTML_EXTRA_copied = $(abs_builddir)/texinfo.css
+
+TEXI_FRAGMENTS = monotonevars.texi pcrepattern.texi pcresyntax.texi
+
+man1_MANS = mtn.1
+info_TEXINFOS = monotone.texi
+
+monotone_TEXINFOS = ../src/std_hooks.lua $(TEXI_FRAGMENTS) \
+	$(EPS_FIGURES_generated) \
+	$(PDF_FIGURES_copied) \
+	$(PNG_FIGURES_copied) $(PNG_IMAGES_copied) \
+	$(HTML_EXTRA_copied)
+
+EXTRA_DIST = \
+	$(PDF_FIGURES) $(PNG_FIGURES) $(TEXI_FRAGMENTS)			\
+	figures/monotone-logo.svg figures/oo-figures.sxd	\
+	figures/pdfcrop.pl figures/README
+
+AM_MAKEINFOFLAGS= -I $(srcdir)
+
+AM_MAKEINFOHTMLFLAGS= -I $(srcdir) \
+	--number-sections --no-split --no-headers --css-ref=texinfo.css
+
+monotonevars.texi: Makefile
+	rm -f monotonevars.texi
+	echo "@set top_srcdir $(top_srcdir)" >> monotonevars.texi
+	echo "@set top_builddir $(top_builddir)" >> monotonevars.texi
+
+## # Html and pdf dependencies are simply copied.
+## # All other are generated with the rules further down.
+## copy-html-deps: texinfo.css $(PNG_FIGURES) $(PNG_IMAGES)
+## 	for f in texinfo.css $(PNG_FIGURES) $(PNG_IMAGES); do \
+## 	    d=`dirname $$f`; \
+## 	    [ -d $$d ] || $(MKDIR_P) $$d && \
+## 		cmp -s $(srcdir)/$$f $(builddir)/$$f || \
+## 		    cp -v $(srcdir)/$$f $(builddir)/$$f; \
+## 	done
+
+#%.eps: %.epsi
+#	mv -f $< $@
+#
+#%.epsi: %.ps
+#	ps2epsi $< $@
+
+figures/%.eps: figures/%.ps
+	$(MKDIR_P) figures
+	ps2eps <$< >$@
+
+figures/%.ps: figures/%.pdf
+#	acroread -toPostScript -pairs $< $@
+	$(MKDIR_P) figures
+	pdftops $< $@
+
+$(abs_builddir)/figures/%.pdf: figures/%.pdf
+	$(MKDIR_P) figures
+	cmp -s $< $@ || cp $< $@
+
+$(abs_builddir)/figures/%.png: figures/%.png
+	$(MKDIR_P) figures
+	cmp -s $< $@ || cp $< $@
+
+$(abs_builddir)/images/%.png: images/%.png
+	$(MKDIR_P) images
+	cmp -s $< $@ || cp $< $@
+
+$(abs_builddir)/texinfo.css: texinfo.css
+	cmp -s $< $@ || cp $< $@
+
+# Stealing code from automake and adapting, we want a HTML file tree as well
+AM_MAKEINFODOCHTMLFLAGS= -I $(srcdir) \
+	--number-sections --css-ref=texinfo.css
+
+# Because automake already generates a html target that produces a single file
+# HTML, we have to use a different target to make a multifile HTML.
+htmldir: monotone.texi $(srcdir)/version.texi $(doc_monotone_TEXINFOS) html/$(am__dirstamp)
+	$(MKDIR_P) html.htp
+	cp -r $(srcdir)/figures html.htp
+	cp -r $(srcdir)/images html.htp
+	cp $(srcdir)/texinfo.css html.htp
+	if $(MAKEINFOHTML) $(AM_MAKEINFODOCHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc -o html.htp `test -f 'monotone.texi' || echo '$(srcdir)/'`monotone.texi; \
+	then \
+	  rm -rf html; \
+	  mv html.htp html; \
+	else \
+	  rm -Rf html.htp; \
+	  exit 1; \
+	fi
+html/$(am__dirstamp):
+	@$(MKDIR_P) html
+	@: > $(am__dirstamp)
+# Then let's have the html target produce the multifile HTML as well.
+html-local: htmldir
+
+# automake doesn't seem to generate any specific PostScript target.
+# It does generate the general rule to produce .ps from .dvi, though,
+# so all we need to do is to set up the dependencies.
+#dvi-local: $(EPS_FIGURES)
+#monotone.ps: $(srcdir)/version.texi $(doc_monotone_TEXINFOS) $(EPS_FIGURES) $(am__dirstamp)
+