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 <al...@nicira.com>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
 Makefile.am     | 18 ++++++++++++++++++
 ovn/automake.mk | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 178e82c..ad536b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,6 +181,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 7eb9c1d..a8c2338 100644
--- a/ovn/automake.mk
+++ b/ovn/automake.mk
@@ -69,24 +69,6 @@ ovn/ovn-nb.5: \
 man_MANS += ovn/ovn-architecture.7 ovn/ovn-nbctl.8
 EXTRA_DIST += ovn/ovn-architecture.7.xml ovn/ovn-nbctl.8.xml
 
-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
-- 
2.1.3

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to