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
4a25137
..
fb9dde6
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-10,8
+10,6
@@
noinst_LIBRARIES += lib/libopenvswitch.a
lib_libopenvswitch_a_SOURCES = \
lib/aes128.c \
lib/aes128.h \
lib_libopenvswitch_a_SOURCES = \
lib/aes128.c \
lib/aes128.h \
- lib/autopath.c \
- lib/autopath.h \
lib/backtrace.c \
lib/backtrace.h \
lib/bitmap.c \
lib/backtrace.c \
lib/backtrace.h \
lib/bitmap.c \
@@
-61,6
+59,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/hmap.h \
lib/hmapx.c \
lib/hmapx.h \
lib/hmap.h \
lib/hmapx.c \
lib/hmapx.h \
+ lib/jhash.c \
+ lib/jhash.h \
lib/json.c \
lib/json.h \
lib/jsonrpc.c \
lib/json.c \
lib/json.h \
lib/jsonrpc.c \
@@
-91,6
+91,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/netdev-tunnel.c \
lib/netdev-pltap.c \
lib/netdev-provider.h \
lib/netdev-tunnel.c \
lib/netdev-pltap.c \
lib/netdev-provider.h \
+ lib/netdev-vport.c \
+ lib/netdev-vport.h \
lib/netdev.c \
lib/netdev.h \
lib/netflow.h \
lib/netdev.c \
lib/netdev.h \
lib/netflow.h \
@@
-113,6
+115,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/ofp-util.c \
lib/ofp-util.def \
lib/ofp-util.h \
lib/ofp-util.c \
lib/ofp-util.def \
lib/ofp-util.h \
+ lib/ofp-version-opt.h \
+ lib/ofp-version-opt.c \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovsdb-data.c \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovsdb-data.c \
@@
-237,8
+241,6
@@
lib_libopenvswitch_a_SOURCES += \
lib/dpif-linux.h \
lib/netdev-linux.c \
lib/netdev-linux.h \
lib/dpif-linux.h \
lib/netdev-linux.c \
lib/netdev-linux.h \
- lib/netdev-vport.c \
- lib/netdev-vport.h \
lib/netlink-notifier.c \
lib/netlink-notifier.h \
lib/netlink-protocol.h \
lib/netlink-notifier.c \
lib/netlink-notifier.h \
lib/netlink-protocol.h \
@@
-291,6
+293,7
@@
MAN_FRAGMENTS += \
lib/daemon-syn.man \
lib/leak-checker.man \
lib/memory-unixctl.man \
lib/daemon-syn.man \
lib/leak-checker.man \
lib/memory-unixctl.man \
+ lib/ofp-version.man \
lib/ovs.tmac \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
lib/ovs.tmac \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \