Merge branch 'master' of git://openvswitch.org/openvswitch

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index f18df91..cd50e91 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -93,6 +93,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/multipath.c \
        lib/multipath.h \
        lib/netdev-dummy.c \
+       lib/netdev-tunnel.c \
+       lib/netdev-pltap.c \
        lib/netdev-provider.h \
        lib/netdev-vport.c \
        lib/netdev-vport.h \
@@ -191,14 +193,14 @@ lib_libopenvswitch_a_SOURCES = \
        lib/svec.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/token-bucket.c \
        lib/token-bucket.h \
+       lib/tunalloc.c \
+       lib/tunalloc.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \
@@ -263,7 +265,7 @@ endif
 if HAVE_POSIX_AIO
 lib_libopenvswitch_a_SOURCES += lib/async-append-aio.c
 else
-lib_libopenvswitch_a_SOURCES += lib/async-append-sync.c
+lib_libopenvswitch_a_SOURCES += lib/async-append-null.c
 endif
 
 if ESX