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

[openvswitch] / python / automake.mk

diff --git a/python/automake.mk b/python/automake.mk
index 96720421075c44763dd9378f659f3210e6829416..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,7 +28,9 @@ ovs_pyfiles = \
        python/ovs/socket_util.py \
        python/ovs/stream.py \
        python/ovs/timeval.py \
-       python/ovs/unixctl.py \
+       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
@@ -62,10 +64,6 @@ ovs-uninstall-local:
 
 ALL_LOCAL += $(srcdir)/python/ovs/version.py
 $(srcdir)/python/ovs/version.py: config.status
-       $(ro_shell) > $@.tmp
-       echo 'VERSION = "$(VERSION)"' >> $@.tmp
-       if [ "$(BUILDNR)" != "0" ]; \
-           then echo 'BUILDNR = "+build$(BUILDNR)"' >> $@.tmp; \
-           else echo 'BUILDNR = ""' >> $@.tmp; \
-       fi;
-       mv $@.tmp $@
+       $(ro_shell) > $(@F).tmp
+       echo 'VERSION = "$(VERSION)"' >> $(@F).tmp
+       if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi