Merge branch 'mainstream'
[sliver-openvswitch.git] / lib / automake.mk
index f3868db..ac583c2 100644 (file)
@@ -100,6 +100,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 \
@@ -176,8 +178,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 \
@@ -208,6 +208,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 \
@@ -244,6 +246,8 @@ else
 lib_libopenvswitch_la_SOURCES += \
        lib/daemon.c \
        lib/latch-unix.c \
+       lib/signals.c \
+       lib/signals.h \
        lib/stream-fd-unix.c \
        lib/stream-unix.c
 endif