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
2ef806e
..
ebf3f9d
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-40,7
+40,6
@@
lib_libopenvswitch_la_SOURCES = \
lib/crc32c.h \
lib/csum.c \
lib/csum.h \
lib/crc32c.h \
lib/csum.c \
lib/csum.h \
- lib/daemon.c \
lib/daemon.h \
lib/dhcp.h \
lib/dummy.c \
lib/daemon.h \
lib/dhcp.h \
lib/dummy.c \
@@
-101,6
+100,8
@@
lib_libopenvswitch_la_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-vport.c \
lib/netdev-vport.h \
lib/netdev-provider.h \
lib/netdev-vport.c \
lib/netdev-vport.h \
@@
-211,6
+212,8
@@
lib_libopenvswitch_la_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 \
@@
-239,10
+242,12
@@
lib_libopenvswitch_la_SOURCES = \
if WIN32
lib_libopenvswitch_la_SOURCES += \
if WIN32
lib_libopenvswitch_la_SOURCES += \
+ lib/daemon-windows.c \
lib/getopt_long.c \
lib/latch-windows.c
else
lib_libopenvswitch_la_SOURCES += \
lib/getopt_long.c \
lib/latch-windows.c
else
lib_libopenvswitch_la_SOURCES += \
+ lib/daemon.c \
lib/latch.c
endif
lib/latch.c
endif
@@
-337,6
+342,8
@@
MAN_FRAGMENTS += \
lib/memory-unixctl.man \
lib/ofp-version.man \
lib/ovs.tmac \
lib/memory-unixctl.man \
lib/ofp-version.man \
lib/ovs.tmac \
+ lib/service.man \
+ lib/service-syn.man \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
lib/ssl-peer-ca-cert.man \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
lib/ssl-peer-ca-cert.man \