Include headers where ovs_rundir is used.

[cascardo/ovs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 178e82c..a659814 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,13 +51,9 @@ endif
 # vSwitch, but it causes trouble if you switch from a version with
 # foo/__init__.py into an (older) version with plain foo.py, since
 # foo/__init__.pyc will cause Python to ignore foo.py.
-if INCLUDE_PYTHON_COMPAT
-run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH
-else
-run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH
-endif
-run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
-
+run_python = \
+       PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
+       PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -181,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)
@@ -375,7 +389,6 @@ include ovsdb/automake.mk
 include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
-include python/compat/automake.mk
 include tutorial/automake.mk
 include vtep/automake.mk
 include datapath-windows/automake.mk