projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Fix invalid format specifier.
[openvswitch]
/
python
/
automake.mk
diff --git
a/python/automake.mk
b/python/automake.mk
index 7ea31186c8e146a84a8137da8017d5d3c3a231b1..96869e30e3ba1bf073ae99c520dd5f0880eefd71 100644
(file)
--- a/
python/automake.mk
+++ b/
python/automake.mk
@@
-1,12
+1,11
@@
-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/udp.py \
ovstest_pyfiles = \
python/ovstest/__init__.py \
python/ovstest/args.py \
python/ovstest/rpcserver.py \
python/ovstest/tcp.py \
python/ovstest/udp.py \
- python/ovstest/util.py
+ python/ovstest/util.py \
+ python/ovstest/vswitch.py
ovs_pyfiles = \
python/ovs/__init__.py \
ovs_pyfiles = \
python/ovs/__init__.py \
@@
-28,9
+27,13
@@
ovs_pyfiles = \
python/ovs/socket_util.py \
python/ovs/stream.py \
python/ovs/timeval.py \
python/ovs/socket_util.py \
python/ovs/stream.py \
python/ovs/timeval.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/version.py \
- python/ovs/vlog.py
\
- python/ovs/util.py
+ python/ovs/vlog.py
+
PYFILES = $(ovs_pyfiles) python/ovs/dirs.py $(ovstest_pyfiles)
EXTRA_DIST += $(PYFILES)
PYCOV_CLEAN_FILES += $(PYFILES:.py=.py,cover)
PYFILES = $(ovs_pyfiles) python/ovs/dirs.py $(ovstest_pyfiles)
EXTRA_DIST += $(PYFILES)
PYCOV_CLEAN_FILES += $(PYFILES:.py=.py,cover)
@@
-60,7
+63,6
@@
ovs-uninstall-local:
ALL_LOCAL += $(srcdir)/python/ovs/version.py
$(srcdir)/python/ovs/version.py: config.status
ALL_LOCAL += $(srcdir)/python/ovs/version.py
$(srcdir)/python/ovs/version.py: config.status
- $(ro_shell) > $@.tmp
- echo 'VERSION = "$(VERSION)"' >> $@.tmp
- echo 'BUILDNR = "$(BUILDNR)"' >> $@.tmp
- 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