ovsdb-idl: New function to obtain the current transaction from any row.

[openvswitch] / ovsdb / automake.mk

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index d2a3e04ced63b24349e5e4c7cdd041f9f4c39771..2dcc46384169873f56ad5be6143ddcb214a9b4fd 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -10,6 +10,8 @@ ovsdb_libovsdb_a_SOURCES = \
        ovsdb/file.h \
        ovsdb/jsonrpc-server.c \
        ovsdb/jsonrpc-server.h \
+       ovsdb/log.c \
+       ovsdb/log.h \
        ovsdb/ovsdb-server.c \
        ovsdb/ovsdb.c \
        ovsdb/ovsdb.h \
@@ -28,17 +30,65 @@ ovsdb_libovsdb_a_SOURCES = \
 bin_PROGRAMS += ovsdb/ovsdb-tool
 ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
 ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
+# ovsdb-tool.1
+man_MANS += ovsdb/ovsdb-tool.1
+DISTCLEANFILES += ovsdb/ovsdb-tool.1
+EXTRA_DIST += ovsdb/ovsdb-tool.1.in
 
-## ovsdb-tool.8
-#man_MANS += ovsdb/ovsdb-tool.8
-#DISTCLEANFILES += ovsdb/ovsdb-tool.8
-#EXTRA_DIST += ovsdb/ovsdb-tool.8.in
+# ovsdb-client
+bin_PROGRAMS += ovsdb/ovsdb-client
+ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c
+ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
+# ovsdb-client.1
+man_MANS += ovsdb/ovsdb-client.1
+DISTCLEANFILES += ovsdb/ovsdb-client.1
+EXTRA_DIST += ovsdb/ovsdb-client.1.in
 
 # ovsdb-server
 sbin_PROGRAMS += ovsdb/ovsdb-server
 ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c
 ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(FAULT_LIBS)
-## ovsdb-server.8
-#man_MANS += ovsdb/ovsdb-server.8
-#DISTCLEANFILES += ovsdb/ovsdb-server.8
-#EXTRA_DIST += ovsdb/ovsdb-server.8.in
+# ovsdb-server.1
+man_MANS += ovsdb/ovsdb-server.1
+DISTCLEANFILES += ovsdb/ovsdb-server.1
+EXTRA_DIST += ovsdb/ovsdb-server.1.in
+
+# ovsdb-idlc
+EXTRA_DIST += \
+       ovsdb/simplejson/__init__.py \
+       ovsdb/simplejson/_speedups.c                            \
+       ovsdb/simplejson/decoder.py                             \
+       ovsdb/simplejson/encoder.py                             \
+       ovsdb/simplejson/scanner.py                             \
+       ovsdb/simplejson/tests/__init__.py                      \
+       ovsdb/simplejson/tests/test_check_circular.py           \
+       ovsdb/simplejson/tests/test_decode.py                   \
+       ovsdb/simplejson/tests/test_default.py                  \
+       ovsdb/simplejson/tests/test_dump.py                     \
+       ovsdb/simplejson/tests/test_encode_basestring_ascii.py  \
+       ovsdb/simplejson/tests/test_fail.py                     \
+       ovsdb/simplejson/tests/test_float.py                    \
+       ovsdb/simplejson/tests/test_indent.py                   \
+       ovsdb/simplejson/tests/test_pass1.py                    \
+       ovsdb/simplejson/tests/test_pass2.py                    \
+       ovsdb/simplejson/tests/test_pass3.py                    \
+       ovsdb/simplejson/tests/test_recursion.py                \
+       ovsdb/simplejson/tests/test_scanstring.py               \
+       ovsdb/simplejson/tests/test_separators.py               \
+       ovsdb/simplejson/tests/test_unicode.py                  \
+       ovsdb/simplejson/tool.py
+noinst_SCRIPTS += ovsdb/ovsdb-idlc
+EXTRA_DIST += \
+       ovsdb/ovsdb-idlc.in \
+       ovsdb/ovsdb-idlc.1
+DISTCLEANFILES += ovsdb/ovsdb-idlc
+SUFFIXES += .ovsidl
+.ovsidl.c:
+       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in c-idl-source $< > $@.tmp
+       mv $@.tmp $@
+.ovsidl.h:
+       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in c-idl-header $< > $@.tmp
+       mv $@.tmp $@
+.ovsidl.ovsschema:
+       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in ovsdb-schema $< > $@.tmp
+       mv $@.tmp $@