Merge branch 'mainstream'

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

diff --git a/lib/automake.mk b/lib/automake.mk
index 449d2c5..7900fa3 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -81,7 +81,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 \
@@ -102,6 +101,8 @@ lib_libopenvswitch_la_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 \
@@ -212,6 +213,8 @@ lib_libopenvswitch_la_SOURCES = \
        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 \
@@ -237,6 +240,12 @@ lib_libopenvswitch_la_SOURCES = \
        lib/vswitch-idl.h \
        lib/vtep-idl.c \
        lib/vtep-idl.h
+if WIN32
+lib_libopenvswitch_la_SOURCES += lib/latch-windows.c
+else
+lib_libopenvswitch_la_SOURCES += lib/latch.c
+endif
+
 EXTRA_DIST += \
        lib/stdio.h.in \
        lib/string.h.in