ofp-print: Avoid double space before "actions" for catch-all flows.

[openvswitch] / ovsdb / automake.mk

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 5b46e168e9bded0f5f1b312da73e008c692803c1..39bc65fcf0b5d80d50a455aa95f6cd1b673e642d 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -21,13 +21,15 @@ ovsdb_libovsdb_a_SOURCES = \
        ovsdb/query.h \
        ovsdb/row.c \
        ovsdb/row.h \
+       ovsdb/server.c \
+       ovsdb/server.h \
        ovsdb/table.c \
        ovsdb/table.h \
        ovsdb/trigger.c \
        ovsdb/trigger.h \
        ovsdb/transaction.c \
        ovsdb/transaction.h
-EXTRA_DIST += \
+MAN_FRAGMENTS += \
        ovsdb/remote-active.man \
        ovsdb/remote-passive.man
 
@@ -59,31 +61,8 @@ DISTCLEANFILES += ovsdb/ovsdb-server.1
 EXTRA_DIST += ovsdb/ovsdb-server.1.in
 
 # ovsdb-idlc
-EXTRA_DIST += \
-       ovsdb/SPECS \
-       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/SPECS
+noinst_SCRIPTS += ovsdb/ovsdb-idlc
 EXTRA_DIST += \
        ovsdb/ovsdb-idlc.in \
        ovsdb/ovsdb-idlc.1
@@ -117,7 +96,7 @@ DISTCLEANFILES += ovsdb/ovsdb-doc
 OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc.in
 
 # ovsdb-dot
-EXTRA_DIST += ovsdb/ovsdb-dot.in
+EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
 noinst_SCRIPTS += ovsdb/ovsdb-dot
 DISTCLEANFILES += ovsdb/ovsdb-dot
 OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in