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 'master' into 'next'.
[sliver-openvswitch.git]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index
efc1fd7
..
8c97100
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-55,6
+55,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/hash.h \
lib/hmap.c \
lib/hmap.h \
lib/hash.h \
lib/hmap.c \
lib/hmap.h \
+ lib/hmapx.c \
+ lib/hmapx.h \
lib/json.c \
lib/json.h \
lib/jsonrpc.c \
lib/json.c \
lib/json.h \
lib/jsonrpc.c \
@@
-169,6
+171,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/vconn-stream.c \
lib/vconn.c \
lib/vconn.h \
lib/vconn-stream.c \
lib/vconn.c \
lib/vconn.h \
+ lib/vlan-bitmap.c \
+ lib/vlan-bitmap.h \
lib/vlog.c \
lib/vlog.h
nodist_lib_libopenvswitch_a_SOURCES = \
lib/vlog.c \
lib/vlog.h
nodist_lib_libopenvswitch_a_SOURCES = \