[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 3de388af524c35baf76da9629fc418a2854d359d

[code]

revision:            3de388af524c35baf76da9629fc418a2854d359d
date:                2011-02-01T08:53:53
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.source-tree-cleanup
changelog:
* Makefile.am (SUBDIRS): Define it and have it point out doc/.
  (info-local, dvi-local, pdf-local, ps-local, html-local): No longer needed.
  (doc/monotone.dvi): Have this depend on ps instead of ps-local.
  (doc/monotone.pdf, doc/monotone.ps, doc/html, doc/monotone.html): Likewise.
  (man1_MANS): Added, since it's produce in this directory.
* doc/Makefile.am (man1_MANS): Removed.

manifest:
format_version "1"

new_manifest [a90e19cd6e7b41e15d9c94d06351d3c4e9de4d22]

old_revision [adea9595011591375f0fc9c48bf741ae59cf328f]

patch "Makefile.am"
 from [7e719f1909084a3a8a1096de757ea4854a223127]
   to [0d68bedcf529b69eaca6ad3a4e541745360b9992]

patch "doc/Makefile.am"
 from [dbc3b79d214092fecb27c6d198146a29978a3daf]
   to [483363d12102131a57aaa47213bb616a293fae1f]
============================================================
--- Makefile.am	7e719f1909084a3a8a1096de757ea4854a223127
+++ Makefile.am	0d68bedcf529b69eaca6ad3a4e541745360b9992
@@ -12,6 +12,8 @@ ACLOCAL_AMFLAGS  = -I m4
 AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
 ACLOCAL_AMFLAGS  = -I m4
 
+SUBDIRS = doc
+
 CMD_SOURCES =								\
 	src/cmd.hh src/cmd.cc src/cmd_netsync.cc src/cmd_list.cc 	\
 	src/cmd_packet.cc src/cmd_key_cert.cc src/cmd_merging.cc 	\
@@ -720,30 +722,21 @@ distcheck-hook:
                        $(UNIX_PLATFORM_SOURCES) $(WIN32_PLATFORM_SOURCES) \
                        src/win32/main.cc src/unix/main.cc)
 
+man1_MANS = mtn.1
+
 mtn.1: mtn$(EXEEXT)
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
 	(cd $(srcdir) && $$REAL_BLDDIR/mtn manpage --norc) 2>/dev/null >$@ || rm -f $@
 
+doc/monotone.dvi: dvi
+doc/monotone.pdf: pdf
+doc/monotone.ps: ps
+doc/html doc/monotone.html: html
 
-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
+.PHONY: doc/monotone.dvi doc/monotone.pdf doc/monotone.ps doc/monotone.html \
+	doc/html
 
 # Verbosity goo.
 V_bcxx       = $(V_bcxx_$(V))
============================================================
--- doc/Makefile.am	dbc3b79d214092fecb27c6d198146a29978a3daf
+++ doc/Makefile.am	483363d12102131a57aaa47213bb616a293fae1f
@@ -41,7 +41,6 @@ TEXI_FRAGMENTS = monotonevars.texi pcrep
 
 TEXI_FRAGMENTS = monotonevars.texi pcrepattern.texi pcresyntax.texi
 
-man1_MANS = mtn.1
 info_TEXINFOS = monotone.texi
 
 monotone_TEXINFOS = ../src/std_hooks.lua $(TEXI_FRAGMENTS)