# libovsdb
-noinst_LIBRARIES += ovsdb/libovsdb.a
-ovsdb_libovsdb_a_SOURCES = \
+lib_LTLIBRARIES += ovsdb/libovsdb.la
+ovsdb_libovsdb_la_LDFLAGS = -release $(VERSION)
+ovsdb_libovsdb_la_SOURCES = \
ovsdb/column.c \
ovsdb/column.h \
ovsdb/condition.c \
ovsdb/jsonrpc-server.h \
ovsdb/log.c \
ovsdb/log.h \
+ ovsdb/mutation.c \
+ ovsdb/mutation.h \
ovsdb/ovsdb-server.c \
ovsdb/ovsdb.c \
ovsdb/ovsdb.h \
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
+ovsdb_libovsdb_la_CFLAGS = $(AM_CFLAGS)
+ovsdb_libovsdb_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+MAN_FRAGMENTS += \
+ ovsdb/remote-active.man \
+ ovsdb/remote-passive.man
# ovsdb-tool
bin_PROGRAMS += ovsdb/ovsdb-tool
ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
-ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
+ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS)
# ovsdb-tool.1
man_MANS += ovsdb/ovsdb-tool.1
DISTCLEANFILES += ovsdb/ovsdb-tool.1
-EXTRA_DIST += ovsdb/ovsdb-tool.1.in
+MAN_ROOTS += ovsdb/ovsdb-tool.1.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_ovsdb_client_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS)
# ovsdb-client.1
man_MANS += ovsdb/ovsdb-client.1
DISTCLEANFILES += ovsdb/ovsdb-client.1
-EXTRA_DIST += ovsdb/ovsdb-client.1.in
+MAN_ROOTS += 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_ovsdb_server_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS)
# ovsdb-server.1
man_MANS += ovsdb/ovsdb-server.1
DISTCLEANFILES += ovsdb/ovsdb-server.1
-EXTRA_DIST += ovsdb/ovsdb-server.1.in
+MAN_ROOTS += 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
+EXTRA_DIST += ovsdb/SPECS
noinst_SCRIPTS += ovsdb/ovsdb-idlc
-EXTRA_DIST += \
- ovsdb/ovsdb-idlc.in \
- ovsdb/ovsdb-idlc.1
+EXTRA_DIST += ovsdb/ovsdb-idlc.in
+MAN_ROOTS += ovsdb/ovsdb-idlc.1
DISTCLEANFILES += ovsdb/ovsdb-idlc
-SUFFIXES += .ovsidl
+SUFFIXES += .ovsidl .ovsschema
+OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
.ovsidl.c:
- $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in c-idl-source $< > $@.tmp
+ $(OVSDB_IDLC) 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
+ $(OVSDB_IDLC) c-idl-header $< > $@.tmp
mv $@.tmp $@
+
+EXTRA_DIST += $(OVSIDL_BUILT)
+BUILT_SOURCES += $(OVSIDL_BUILT)
+
+# This must be done late: macros in targets are expanded when the
+# target line is read, so if this file were to be included before some
+# other file that added to OVSIDL_BUILT, then those files wouldn't get
+# the dependency.
+#
+# However, current versions of Automake seem to output all variable
+# assignments before any targets, so it doesn't seem to be a problem,
+# at least for now.
+$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
+
+# ovsdb-doc
+EXTRA_DIST += ovsdb/ovsdb-doc
+OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc
+
+# ovsdb-dot
+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