netdev-dpdk: fix mbuf leaks

[cascardo/ovs.git] / ovsdb / automake.mk

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 8605410..7db6fea 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -1,6 +1,10 @@
 # libovsdb
-noinst_LIBRARIES += ovsdb/libovsdb.a
-ovsdb_libovsdb_a_SOURCES = \
+lib_LTLIBRARIES += ovsdb/libovsdb.la
+ovsdb_libovsdb_la_LDFLAGS = \
+        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+        -Wl,--version-script=$(top_builddir)/ovsdb/libovsdb.sym \
+        $(AM_LDFLAGS)
+ovsdb_libovsdb_la_SOURCES = \
        ovsdb/column.c \
        ovsdb/column.h \
        ovsdb/condition.c \
@@ -14,93 +18,73 @@ ovsdb_libovsdb_a_SOURCES = \
        ovsdb/log.h \
        ovsdb/mutation.c \
        ovsdb/mutation.h \
-       ovsdb/ovsdb-server.c \
        ovsdb/ovsdb.c \
        ovsdb/ovsdb.h \
+       ovsdb/monitor.c \
+       ovsdb/monitor.h \
        ovsdb/query.c \
        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 += \
+ovsdb_libovsdb_la_CFLAGS = $(AM_CFLAGS)
+ovsdb_libovsdb_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+pkgconfig_DATA += \
+       $(srcdir)/ovsdb/libovsdb.pc
+
+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
 # 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 $(SSL_LIBS)
+ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # 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 $(SSL_LIBS)
+ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # 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
 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 .txt
-OVSDB_IDLC = $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in
+SUFFIXES += .ovsidl .ovsschema
+OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
-       $(OVSDB_IDLC) c-idl-source $< > $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)$(OVSDB_IDLC) c-idl-source $< > $@.tmp && mv $@.tmp $@
 .ovsidl.h:
-       $(OVSDB_IDLC) c-idl-header $< > $@.tmp
-       mv $@.tmp $@
-.ovsidl.txt:
-       $(OVSDB_IDLC) doc $< | fmt -s > $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)$(OVSDB_IDLC) c-idl-header $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += $(OVSIDL_BUILT)
 BUILT_SOURCES += $(OVSIDL_BUILT)
+CLEANFILES += $(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
@@ -111,3 +95,13 @@ BUILT_SOURCES += $(OVSIDL_BUILT)
 # 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