git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index
d5927d6
..
4a25137
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-88,6
+88,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/multipath.c \
lib/multipath.h \
lib/netdev-dummy.c \
lib/multipath.c \
lib/multipath.h \
lib/netdev-dummy.c \
+ lib/netdev-tunnel.c \
+ lib/netdev-pltap.c \
lib/netdev-provider.h \
lib/netdev.c \
lib/netdev.h \
lib/netdev-provider.h \
lib/netdev.c \
lib/netdev.h \
@@
-181,6
+183,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/timeval.h \
lib/token-bucket.c \
lib/token-bucket.h \
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 \
lib/type-props.h \
lib/unaligned.h \
lib/unicode.c \
@@
-227,7
+231,7
@@
if HAVE_WNO_UNUSED_PARAMETER
lib_libsflow_a_CFLAGS += -Wno-unused-parameter
endif
lib_libsflow_a_CFLAGS += -Wno-unused-parameter
endif
-if
HAVE_NETLINK
+if
LINUX_DATAPATH
lib_libopenvswitch_a_SOURCES += \
lib/dpif-linux.c \
lib/dpif-linux.h \
lib_libopenvswitch_a_SOURCES += \
lib/dpif-linux.c \
lib/dpif-linux.h \
@@
-246,6
+250,11
@@
lib_libopenvswitch_a_SOURCES += \
lib/route-table.h
endif
lib/route-table.h
endif
+if ESX
+lib_libopenvswitch_a_SOURCES += \
+ lib/route-table-stub.c
+endif
+
if HAVE_IF_DL
lib_libopenvswitch_a_SOURCES += \
lib/netdev-bsd.c \
if HAVE_IF_DL
lib_libopenvswitch_a_SOURCES += \
lib/netdev-bsd.c \