Change how man pages are built (and where they are built to). Building man

pages should now be more consistent across systems.

* arch/Makefile.inc: Build yasm_arch.7 at top level, and in dist_man_MANS
instead of man_MANS.  Include build rule for building using XMLTO if XMLTO
is available.
* yasm/Makefile.inc: Likewise (for yasm.1).
* Makefile.am: Change man_MANS to dist_man_MANS.  Remove general rules for
.xml.1 and .xml.7.  Add dist_man_MANS to MAINTAINERCLEANFILES.  Remove
man_MANS from BUILT_SOURCES, DISTCLEANFILES, and EXTRA_DIST.


svn path=/trunk/yasm/; revision=1189

Makefile.am

@@ -6,7 +6,7 @@ AM_YFLAGS = -d
 AM_CFLAGS = @MORE_CFLAGS@
 
 bin_PROGRAMS =
-man_MANS =
+dist_man_MANS =
 TESTS =
 noinst_PROGRAMS =
 
@@ -70,19 +70,6 @@ distclean-local:
 	-rm -rf results
 
 if BUILD_MAN
-.xml.1:
-	$(XMLTO) -o $(@D) man $<
-.xml.7:
-	$(XMLTO) -o $(@D) man $<
-else
-.xml.1:
-	@echo "Not rebuilding man page from $<"
-	cp `test -f $*.1 || echo '$(srcdir)/'`$*.1 $@
-.xml.7:
-	@echo "Not rebuilding man page from $<"
-	cp `test -f $*.7 || echo '$(srcdir)/'`$*.7 $@
+MAINTAINERCLEANFILES = $(dist_man_MANS)
 endif
 
-BUILT_SOURCES += $(man_MANS)
-DISTCLEANFILES += $(man_MANS)
-EXTRA_DIST += $(man_MANS)

frontends/yasm/Makefile.inc

@@ -1,7 +1,12 @@
 # $Id$
 
 bin_PROGRAMS += yasm
-man_MANS += frontends/yasm/yasm.1
+dist_man_MANS += yasm.1
+
+if BUILD_MAN
+yasm.1: frontends/yasm/yasm.xml
+	$(XMLTO) -o $(top_builddir) man $(srcdir)/frontends/yasm/yasm.xml
+endif
 
 yasm_SOURCES  = frontends/yasm/yasm.c
 yasm_SOURCES += frontends/yasm/yasm-options.c

modules/arch/Makefile.inc

@@ -6,5 +6,11 @@ EXTRA_DIST += modules/arch/lc3b/Makefile.inc
 include modules/arch/x86/Makefile.inc
 include modules/arch/lc3b/Makefile.inc
 
-man_MANS += modules/arch/yasm_arch.7
+dist_man_MANS += yasm_arch.7
+
+if BUILD_MAN
+yasm_arch.7: modules/arch/yasm_arch.xml
+	$(XMLTO) -o $(top_builddir) man $(srcdir)/modules/arch/yasm_arch.xml
+endif
+
 EXTRA_DIST += modules/arch/yasm_arch.xml