ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / python / automake.mk

diff --git a/python/automake.mk b/python/automake.mk
index 089ef36531351aad3322a4c6cb5047aed74d8029..b656f088f6bae7da0d4a04d9f5cc85446e976669 100644 (file)
--- a/python/automake.mk
+++ b/python/automake.mk
@@ -1,12 +1,12 @@
-run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHON_PATH $(PYTHON)
-
 ovstest_pyfiles = \
        python/ovstest/__init__.py \
        python/ovstest/args.py \
        python/ovstest/rpcserver.py \
        python/ovstest/tcp.py \
+       python/ovstest/tests.py \
        python/ovstest/udp.py \
-       python/ovstest/util.py
+       python/ovstest/util.py \
+       python/ovstest/vswitch.py
 
 ovs_pyfiles = \
        python/ovs/__init__.py \
@@ -28,9 +28,16 @@ ovs_pyfiles = \
        python/ovs/socket_util.py \
        python/ovs/stream.py \
        python/ovs/timeval.py \
-       python/ovs/vlog.py \
-       python/ovs/util.py
-EXTRA_DIST += $(ovs_pyfiles) python/ovs/dirs.py $(ovstest_pyfiles)
+       python/ovs/unixctl/__init__.py \
+       python/ovs/unixctl/client.py \
+       python/ovs/unixctl/server.py \
+       python/ovs/util.py \
+       python/ovs/version.py \
+       python/ovs/vlog.py
+
+PYFILES = $(ovs_pyfiles) python/ovs/dirs.py $(ovstest_pyfiles)
+EXTRA_DIST += $(PYFILES)
+PYCOV_CLEAN_FILES += $(PYFILES:.py=.py,cover)
 
 if HAVE_PYTHON
 nobase_pkgdata_DATA = $(ovs_pyfiles) $(ovstest_pyfiles)
@@ -54,3 +61,9 @@ install-data-local: ovs-install-data-local
 UNINSTALL_LOCAL += ovs-uninstall-local
 ovs-uninstall-local:
        rm -f $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py
+
+ALL_LOCAL += $(srcdir)/python/ovs/version.py
+$(srcdir)/python/ovs/version.py: config.status
+       $(ro_shell) > $(@F).tmp
+       echo 'VERSION = "$(VERSION)"' >> $(@F).tmp
+       if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi