From 99635791adde88469a2a472af009eb7fa6117c60 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Mon, 22 Jun 2015 15:42:29 -0700
Subject: 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>
---
 Makefile.am     | 18 ++++++++++++++++++
 ovn/automake.mk | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 182bb69a1..a659814cf 100644
--- 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 ee20ce72e..459ee36f7 100644
--- 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
-- 
cgit v1.2.1