ovn: l3ha fix bundle action generation

[ovs.git] / ovsdb / automake.mk

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index a66974a57a8af3a552d25c124d42e688528ce11b..50e5ab367eff2fd7787b1e267704bc2f10f2f68a 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -1,7 +1,7 @@
 # libovsdb
 lib_LTLIBRARIES += ovsdb/libovsdb.la
 ovsdb_libovsdb_la_LDFLAGS = \
-        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+        $(OVS_LTINFO) \
         -Wl,--version-script=$(top_builddir)/ovsdb/libovsdb.sym \
         $(AM_LDFLAGS)
 ovsdb_libovsdb_la_SOURCES = \
@@ -20,8 +20,14 @@ ovsdb_libovsdb_la_SOURCES = \
        ovsdb/mutation.h \
        ovsdb/ovsdb.c \
        ovsdb/ovsdb.h \
+       ovsdb/monitor.c \
+       ovsdb/monitor.h \
        ovsdb/query.c \
        ovsdb/query.h \
+       ovsdb/rbac.c \
+       ovsdb/rbac.h \
+       ovsdb/replication.c \
+       ovsdb/replication.h \
        ovsdb/row.c \
        ovsdb/row.h \
        ovsdb/server.c \
@@ -31,16 +37,24 @@ ovsdb_libovsdb_la_SOURCES = \
        ovsdb/trigger.c \
        ovsdb/trigger.h \
        ovsdb/transaction.c \
-       ovsdb/transaction.h
+       ovsdb/transaction.h \
+       ovsdb/ovsdb-util.c \
+       ovsdb/ovsdb-util.h
 ovsdb_libovsdb_la_CFLAGS = $(AM_CFLAGS)
 ovsdb_libovsdb_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 pkgconfig_DATA += \
-       $(srcdir)/ovsdb/libovsdb.pc
+       ovsdb/libovsdb.pc
 
 MAN_FRAGMENTS += \
        ovsdb/remote-active.man \
-       ovsdb/remote-passive.man
+       ovsdb/remote-passive.man \
+       ovsdb/replication.man \
+       ovsdb/replication-syn.man
+
+EXTRA_DIST += \
+       ovsdb/remote-active.xml \
+       ovsdb/remote-passive.xml
 
 # ovsdb-tool
 bin_PROGRAMS += ovsdb/ovsdb-tool
@@ -48,7 +62,7 @@ ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
 ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # ovsdb-tool.1
 man_MANS += ovsdb/ovsdb-tool.1
-DISTCLEANFILES += ovsdb/ovsdb-tool.1
+CLEANFILES += ovsdb/ovsdb-tool.1
 MAN_ROOTS += ovsdb/ovsdb-tool.1.in
 
 # ovsdb-client
@@ -57,7 +71,7 @@ ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c
 ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # ovsdb-client.1
 man_MANS += ovsdb/ovsdb-client.1
-DISTCLEANFILES += ovsdb/ovsdb-client.1
+CLEANFILES += ovsdb/ovsdb-client.1
 MAN_ROOTS += ovsdb/ovsdb-client.1.in
 
 # ovsdb-server
@@ -66,14 +80,14 @@ ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c
 ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # ovsdb-server.1
 man_MANS += ovsdb/ovsdb-server.1
-DISTCLEANFILES += ovsdb/ovsdb-server.1
+CLEANFILES += ovsdb/ovsdb-server.1
 MAN_ROOTS += ovsdb/ovsdb-server.1.in
 
 # ovsdb-idlc
 noinst_SCRIPTS += ovsdb/ovsdb-idlc
 EXTRA_DIST += ovsdb/ovsdb-idlc.in
 MAN_ROOTS += ovsdb/ovsdb-idlc.1
-DISTCLEANFILES += ovsdb/ovsdb-idlc
+CLEANFILES += ovsdb/ovsdb-idlc
 SUFFIXES += .ovsidl .ovsschema
 OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
@@ -81,8 +95,8 @@ OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.h:
        $(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
@@ -101,5 +115,5 @@ 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
+CLEANFILES += ovsdb/ovsdb-dot
 OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in