datapath: collect mega flow mask stats

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 08aea0f..b1ad24d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,10 +27,13 @@ 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.
-run_python = \
-       PYTHONDONTWRITEBYTECODE=yes \
-       PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \
-       $(PYTHON)
+if INCLUDE_PYTHON_COMPAT
+run_python = PYTHONPATH=$(top_srcdir)/python:$(top_srcdir)/python/compat:$$PYTHONPATH
+else
+run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH
+endif
+run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -202,7 +205,7 @@ ALL_LOCAL += check-assert-h-usage
 check-assert-h-usage:
        @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
            (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \
-           $(EGREP) -v '^lib/(sflow_receiver|vlog|worker).c$$|^tests/'; \
+           $(EGREP) -v '^lib/(sflow_receiver|vlog).c$$|^tests/'; \
          then \
            echo "Files listed above unexpectedly #include <""assert.h"">."; \
            echo "Please use ovs_assert (from util.h) instead of assert."; \
@@ -274,3 +277,4 @@ include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
 include tutorial/automake.mk
+include vtep/automake.mk