lib/rstp: Simplify priority vector comparison.
[cascardo/ovs.git] / lib / automake.mk
index 5eece1c..b14a510 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -8,6 +8,11 @@
 lib_LTLIBRARIES += lib/libopenvswitch.la
 
 lib_libopenvswitch_la_LIBADD = $(SSL_LIBS)
+
+if WIN32
+lib_libopenvswitch_la_LIBADD += ${PTHREAD_LIBS}
+endif
+
 lib_libopenvswitch_la_LDFLAGS = -release $(VERSION)
 
 lib_libopenvswitch_la_SOURCES = \
@@ -29,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 \
@@ -42,12 +49,16 @@ lib_libopenvswitch_la_SOURCES = \
        lib/csum.h \
        lib/daemon.c \
        lib/daemon.h \
+       lib/daemon-private.h \
        lib/dhcp.h \
        lib/dummy.c \
        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 \
        lib/dpif.c \
        lib/dpif.h \
@@ -57,6 +68,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/dynamic-string.h \
        lib/entropy.c \
        lib/entropy.h \
+       lib/fat-rwlock.c \
+       lib/fat-rwlock.h \
        lib/fatal-signal.c \
        lib/fatal-signal.h \
        lib/flow.c \
@@ -79,7 +92,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/jsonrpc.h \
        lib/lacp.c \
        lib/lacp.h \
-       lib/latch.c \
        lib/latch.h \
        lib/learn.c \
        lib/learn.h \
@@ -93,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 \
@@ -125,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 \
@@ -134,12 +147,17 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ovs-atomic-c11.h \
        lib/ovs-atomic-clang.h \
        lib/ovs-atomic-flag-gcc4.7+.h \
-       lib/ovs-atomic-gcc4+.c \
        lib/ovs-atomic-gcc4+.h \
        lib/ovs-atomic-gcc4.7+.h \
-       lib/ovs-atomic-pthreads.c \
+       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 \
        lib/ovs-thread.c \
        lib/ovs-thread.h \
        lib/ovsdb-data.c \
@@ -153,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 \
@@ -161,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 \
@@ -176,8 +203,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/shash.h \
        lib/simap.c \
        lib/simap.h \
-       lib/signals.c \
-       lib/signals.h \
        lib/smap.c \
        lib/smap.h \
        lib/socket-util.c \
@@ -188,14 +213,13 @@ lib_libopenvswitch_la_SOURCES = \
        lib/sset.h \
        lib/stp.c \
        lib/stp.h \
-       lib/stream-fd.c \
        lib/stream-fd.h \
        lib/stream-provider.h \
        lib/stream-ssl.h \
        lib/stream-tcp.c \
-       lib/stream-unix.c \
        lib/stream.c \
        lib/stream.h \
+       lib/stdio.c \
        lib/string.c \
        lib/svec.c \
        lib/svec.h \
@@ -234,7 +258,30 @@ lib_libopenvswitch_la_SOURCES = \
        lib/vswitch-idl.h \
        lib/vtep-idl.c \
        lib/vtep-idl.h
-EXTRA_DIST += lib/string.h.in
+
+if WIN32
+lib_libopenvswitch_la_SOURCES += \
+       lib/daemon-windows.c \
+       lib/getopt_long.c \
+       lib/getrusage-windows.c \
+       lib/latch-windows.c \
+       lib/route-table-stub.c \
+       lib/strsep.c \
+       lib/stream-fd-windows.c
+else
+lib_libopenvswitch_la_SOURCES += \
+       lib/daemon-unix.c \
+       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
+
+EXTRA_DIST += \
+       lib/stdio.h.in \
+       lib/string.h.in
 
 nodist_lib_libopenvswitch_la_SOURCES = \
        lib/dirs.c
@@ -258,7 +305,7 @@ if HAVE_WNO_UNUSED_PARAMETER
 lib_libsflow_la_CFLAGS += -Wno-unused-parameter
 endif
 
-if LINUX_DATAPATH
+if LINUX
 lib_libopenvswitch_la_SOURCES += \
        lib/dpif-linux.c \
        lib/dpif-linux.h \
@@ -269,12 +316,29 @@ 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 \
        lib/route-table.h
 endif
 
+if DPDK_NETDEV
+lib_libopenvswitch_la_SOURCES += \
+       lib/netdev-dpdk.c \
+       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
@@ -320,9 +384,12 @@ 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 \
+       lib/service.man \
+       lib/service-syn.man \
        lib/ssl-bootstrap.man \
        lib/ssl-bootstrap-syn.man \
        lib/ssl-peer-ca-cert.man \
@@ -374,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