lib/netdev-dpdk: increase ring name length for dpdkr ports

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

diff --git a/lib/automake.mk b/lib/automake.mk
index 018e62c..27a1669 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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,7 @@
 lib_LTLIBRARIES += lib/libopenvswitch.la
 
 lib_libopenvswitch_la_LIBADD = $(SSL_LIBS)
+lib_libopenvswitch_la_LIBADD += $(CAPNG_LDADD)
 
 if WIN32
 lib_libopenvswitch_la_LIBADD += ${PTHREAD_LIBS}
@@ -50,6 +51,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/crc32c.h \
        lib/csum.c \
        lib/csum.h \
+       lib/ct-dpif.c \
+       lib/ct-dpif.h \
        lib/daemon.c \
        lib/daemon.h \
        lib/daemon-private.h \
@@ -81,6 +84,7 @@ lib_libopenvswitch_la_SOURCES = \
        lib/fatal-signal.h \
        lib/flow.c \
        lib/flow.h \
+       lib/geneve.h \
        lib/guarded-list.c \
        lib/guarded-list.h \
        lib/hash.c \
@@ -146,6 +150,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ofp-parse.h \
        lib/ofp-print.c \
        lib/ofp-print.h \
+       lib/ofp-prop.c \
+       lib/ofp-prop.h \
        lib/ofp-util.c \
        lib/ofp-util.h \
        lib/ofp-version-opt.h \
@@ -189,6 +195,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/pcap-file.h \
        lib/perf-counter.h \
        lib/perf-counter.c \
+       lib/pktbuf.c \
+       lib/pktbuf.h \
        lib/poll-loop.c \
        lib/poll-loop.h \
        lib/process.c \
@@ -244,14 +252,12 @@ lib_libopenvswitch_la_SOURCES = \
        lib/syslog-provider.h \
        lib/table.c \
        lib/table.h \
-       lib/tag.c \
-       lib/tag.h \
        lib/timer.c \
        lib/timer.h \
        lib/timeval.c \
        lib/timeval.h \
-       lib/tnl-arp-cache.c \
-       lib/tnl-arp-cache.h \
+       lib/tnl-neigh-cache.c \
+       lib/tnl-neigh-cache.h \
        lib/tnl-ports.c \
        lib/tnl-ports.h \
        lib/token-bucket.c \
@@ -292,6 +298,7 @@ lib_libopenvswitch_la_SOURCES += \
        lib/getrusage-windows.c \
        lib/latch-windows.c \
        lib/route-table-stub.c \
+       lib/if-notifier-stub.c \
        lib/strsep.c
 else
 lib_libopenvswitch_la_SOURCES += \
@@ -338,8 +345,12 @@ if LINUX
 lib_libopenvswitch_la_SOURCES += \
        lib/dpif-netlink.c \
        lib/dpif-netlink.h \
+       lib/if-notifier.c \
+       lib/if-notifier.h \
        lib/netdev-linux.c \
        lib/netdev-linux.h \
+       lib/netlink-conntrack.c \
+       lib/netlink-conntrack.h \
        lib/netlink-notifier.c \
        lib/netlink-notifier.h \
        lib/netlink-protocol.h \
@@ -347,8 +358,8 @@ lib_libopenvswitch_la_SOURCES += \
        lib/netlink-socket.h \
        lib/ovs-numa.c \
        lib/ovs-numa.h \
-       lib/rtnetlink-link.c \
-       lib/rtnetlink-link.h \
+       lib/rtnetlink.c \
+       lib/rtnetlink.h \
        lib/route-table.c \
        lib/route-table.h
 endif
@@ -379,11 +390,13 @@ endif
 
 if ESX
 lib_libopenvswitch_la_SOURCES += \
-        lib/route-table-stub.c
+       lib/route-table-stub.c \
+       lib/if-notifier-stub.c
 endif
 
 if HAVE_IF_DL
 lib_libopenvswitch_la_SOURCES += \
+       lib/if-notifier-bsd.c \
        lib/netdev-bsd.c \
        lib/rtbsd.c \
        lib/rtbsd.h \
@@ -412,7 +425,8 @@ EXTRA_DIST += \
        lib/dh1024.pem \
        lib/dh2048.pem \
        lib/dh4096.pem \
-       lib/dirs.c.in
+       lib/dirs.c.in \
+       lib/db-ctl-base.xml
 
 MAN_FRAGMENTS += \
        lib/common.man \
@@ -430,6 +444,7 @@ MAN_FRAGMENTS += \
        lib/ssl-bootstrap.man \
        lib/ssl-bootstrap-syn.man \
        lib/ssl-peer-ca-cert.man \
+       lib/ssl-peer-ca-cert-syn.man \
        lib/ssl.man \
        lib/ssl-syn.man \
        lib/table.man \