lib/rstp: Simplify priority vector comparison.

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

diff --git a/lib/automake.mk b/lib/automake.mk
index de3f068..b14a510 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -34,6 +34,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/cfm.h \
        lib/classifier.c \
        lib/classifier.h \
+       lib/cmap.c \
+       lib/cmap.h \
        lib/command-line.c \
        lib/command-line.h \
        lib/compiler.h \
@@ -53,6 +55,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/dummy.h \
        lib/dhparams.h \
        lib/dirs.h \
+       lib/dpctl.c \
+       lib/dpctl.h \
        lib/dpif-netdev.c \
        lib/dpif-netdev.h \
        lib/dpif-provider.h \
@@ -101,6 +105,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/mac-learning.h \
        lib/match.c \
        lib/match.h \
+       lib/mcast-snooping.c \
+       lib/mcast-snooping.h \
        lib/memory.c \
        lib/memory.h \
        lib/meta-flow.c \
@@ -133,7 +139,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ofp-print.c \
        lib/ofp-print.h \
        lib/ofp-util.c \
-       lib/ofp-util.def \
        lib/ofp-util.h \
        lib/ofp-version-opt.h \
        lib/ofp-version-opt.c \
@@ -144,9 +149,12 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ovs-atomic-flag-gcc4.7+.h \
        lib/ovs-atomic-gcc4+.h \
        lib/ovs-atomic-gcc4.7+.h \
+       lib/ovs-atomic-i586.h \
        lib/ovs-atomic-locked.c \
        lib/ovs-atomic-locked.h \
+       lib/ovs-atomic-msvc.h \
        lib/ovs-atomic-pthreads.h \
+       lib/ovs-atomic-x86_64.h \
        lib/ovs-atomic.h \
        lib/ovs-rcu.c \
        lib/ovs-rcu.h \
@@ -163,6 +171,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ovsdb-parser.h \
        lib/ovsdb-types.c \
        lib/ovsdb-types.h \
+       lib/packet-dpif.c \
+       lib/packet-dpif.h \
        lib/packets.c \
        lib/packets.h \
        lib/pcap-file.c \
@@ -171,12 +181,19 @@ lib_libopenvswitch_la_SOURCES = \
        lib/poll-loop.h \
        lib/process.c \
        lib/process.h \
+       lib/pvector.c \
+       lib/pvector.h \
        lib/random.c \
        lib/random.h \
        lib/rconn.c \
        lib/rconn.h \
        lib/reconnect.c \
        lib/reconnect.h \
+       lib/rstp.c \
+       lib/rstp.h \
+       lib/rstp-common.h \
+       lib/rstp-state-machines.c \
+       lib/rstp-state-machines.h \
        lib/sat-math.h \
        lib/seq.c \
        lib/seq.h \
@@ -257,6 +274,7 @@ lib_libopenvswitch_la_SOURCES += \
        lib/latch-unix.c \
        lib/signals.c \
        lib/signals.h \
+       lib/socket-util-unix.c \
        lib/stream-fd-unix.c \
        lib/stream-unix.c
 endif
@@ -298,6 +316,8 @@ lib_libopenvswitch_la_SOURCES += \
        lib/netlink-protocol.h \
        lib/netlink-socket.c \
        lib/netlink-socket.h \
+       lib/ovs-numa.c \
+       lib/ovs-numa.h \
        lib/rtnetlink-link.c \
        lib/rtnetlink-link.h \
        lib/route-table.c \
@@ -310,6 +330,15 @@ lib_libopenvswitch_la_SOURCES += \
        lib/netdev-dpdk.h
 endif
 
+if WIN32
+lib_libopenvswitch_la_SOURCES += \
+       lib/netlink-notifier.c \
+       lib/netlink-notifier.h \
+       lib/netlink-protocol.h \
+       lib/netlink-socket.c \
+       lib/netlink-socket.h
+endif
+
 if HAVE_POSIX_AIO
 lib_libopenvswitch_la_SOURCES += lib/async-append-aio.c
 else
@@ -355,6 +384,7 @@ MAN_FRAGMENTS += \
        lib/coverage-unixctl.man \
        lib/daemon.man \
        lib/daemon-syn.man \
+       lib/dpctl.man \
        lib/memory-unixctl.man \
        lib/ofp-version.man \
        lib/ovs.tmac \
@@ -411,6 +441,14 @@ lib/dirs.c: lib/dirs.c.in Makefile
             > lib/dirs.c.tmp
        mv lib/dirs.c.tmp lib/dirs.c
 
+lib/ofp-actions.inc1: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
+       $(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@
+lib/ofp-actions.inc2: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
+       $(run_python) $^ --definitions > $@.tmp && mv $@.tmp $@
+lib/ofp-actions.lo: lib/ofp-actions.inc1 lib/ofp-actions.inc2
+CLEANFILES += lib/ofp-actions.inc1 lib/ofp-actions.inc2
+EXTRA_DIST += build-aux/extract-ofp-actions lib/ofp-errors.inc
+
 $(srcdir)/lib/ofp-errors.inc: \
        lib/ofp-errors.h include/openflow/openflow-common.h \
        $(srcdir)/build-aux/extract-ofp-errors