Makefiles: Move xml2nroff rule from ovn directory to top level.

Originally only the OVN documentation used the XML format, but now it's
used outside the ovn directory (initially for ovs-sim.1) so it's more
logical to have the xml->nroff rule at the top level.

Reported-by: Alex Wang <alexw@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>

diff --git a/Makefile.am b/Makefile.am
index 182bb69a1badf1726b1a2eb468c0471236c2d834..a659814cf914775c5f9f1fcd652d6c27da62c373 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,6 +177,24 @@ SUFFIXES += .in
        fi
        $(AM_V_at) mv $@.tmp $@
 
+SUFFIXES += .xml
+%: %.xml
+       $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/xml2nroff $< > $@.tmp \
+               --version=$(VERSION) \
+               PKIDIR='$(PKIDIR)' \
+               LOGDIR='$(LOGDIR)' \
+               DBDIR='$(DBDIR)' \
+               PERL='$(PERL)' \
+               PYTHON='$(PYTHON)' \
+               RUNDIR='$(RUNDIR)' \
+               VERSION='$(VERSION)' \
+               localstatedir='$(localstatedir)' \
+               pkgdatadir='$(pkgdatadir)' \
+               sysconfdir='$(sysconfdir)' \
+               bindir='$(bindir)' \
+               sbindir='$(sbindir)'
+       $(AM_v_at)mv $@.tmp $@
+
 .PHONY: clean-pycov
 clean-pycov:
        cd $(srcdir) && rm -f $(PYCOV_CLEAN_FILES)

diff --git a/ovn/automake.mk b/ovn/automake.mk
index ee20ce72e5d341573d3f78300b24a9e5fede599c..459ee36f738d99cd2d80e987d492568e966a10cf 100644 (file)
--- a/ovn/automake.mk
+++ b/ovn/automake.mk
@@ -70,24 +70,6 @@ man_MANS += ovn/ovn-architecture.7 ovn/ovn-nbctl.8
 EXTRA_DIST += ovn/ovn-architecture.7.xml ovn/ovn-nbctl.8.xml
 DISTCLEANFILES += ovn/ovn-nbctl.8 ovn/ovn-architecture.7
 
-SUFFIXES += .xml
-%: %.xml
-       $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/xml2nroff $< > $@.tmp \
-               --version=$(VERSION) \
-               PKIDIR='$(PKIDIR)' \
-               LOGDIR='$(LOGDIR)' \
-               DBDIR='$(DBDIR)' \
-               PERL='$(PERL)' \
-               PYTHON='$(PYTHON)' \
-               RUNDIR='$(RUNDIR)' \
-               VERSION='$(VERSION)' \
-               localstatedir='$(localstatedir)' \
-               pkgdatadir='$(pkgdatadir)' \
-               sysconfdir='$(sysconfdir)' \
-               bindir='$(bindir)' \
-               sbindir='$(sbindir)'
-       $(AM_v_at)mv $@.tmp $@
-
 EXTRA_DIST += \
        ovn/TODO \
        ovn/CONTAINERS.OpenStack.md