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
280fc8b
..
75608a8
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-10,14
+10,13
@@
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/async-append.h \
lib/backtrace.c \
lib/backtrace.h \
lib/bfd.c \
lib/bfd.h \
lib/bitmap.c \
lib/bitmap.h \
lib/backtrace.c \
lib/backtrace.h \
lib/bfd.c \
lib/bfd.h \
lib/bitmap.c \
lib/bitmap.h \
- lib/bond.c \
- lib/bond.h \
lib/bundle.c \
lib/bundle.h \
lib/byte-order.h \
lib/bundle.c \
lib/bundle.h \
lib/byte-order.h \
@@
-32,6
+31,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/compiler.h \
lib/coverage.c \
lib/coverage.h \
lib/compiler.h \
lib/coverage.c \
lib/coverage.h \
+ lib/crc32c.c \
+ lib/crc32c.h \
lib/csum.c \
lib/csum.h \
lib/daemon.c \
lib/csum.c \
lib/csum.h \
lib/daemon.c \
@@
-55,6
+56,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/fatal-signal.h \
lib/flow.c \
lib/flow.h \
lib/fatal-signal.h \
lib/flow.c \
lib/flow.h \
+ lib/guarded-list.c \
+ lib/guarded-list.h \
lib/hash.c \
lib/hash.h \
lib/hindex.c \
lib/hash.c \
lib/hash.h \
lib/hindex.c \
@@
-71,6
+74,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/jsonrpc.h \
lib/lacp.c \
lib/lacp.h \
lib/jsonrpc.h \
lib/lacp.c \
lib/lacp.h \
+ lib/latch.c \
+ lib/latch.h \
lib/learn.c \
lib/learn.h \
lib/learning-switch.c \
lib/learn.c \
lib/learn.h \
lib/learning-switch.c \
@@
-90,6
+95,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-vport.c \
lib/netdev-vport.h \
lib/netdev-provider.h \
lib/netdev-vport.c \
lib/netdev-vport.h \
@@
-122,6
+129,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovs-atomic-c11.h \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovs-atomic-c11.h \
+ lib/ovs-atomic-clang.h \
+ lib/ovs-atomic-flag-gcc4.7+.h \
lib/ovs-atomic-gcc4+.c \
lib/ovs-atomic-gcc4+.h \
lib/ovs-atomic-gcc4.7+.h \
lib/ovs-atomic-gcc4+.c \
lib/ovs-atomic-gcc4+.h \
lib/ovs-atomic-gcc4.7+.h \
@@
-156,6
+165,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/reconnect.c \
lib/reconnect.h \
lib/sat-math.h \
lib/reconnect.c \
lib/reconnect.h \
lib/sat-math.h \
+ lib/seq.c \
+ lib/seq.h \
lib/sha1.c \
lib/sha1.h \
lib/shash.c \
lib/sha1.c \
lib/sha1.h \
lib/shash.c \
@@
-196,6
+207,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 \
@@
-218,7
+231,9
@@
lib_libopenvswitch_a_SOURCES = \
lib/vlog.c \
lib/vlog.h \
lib/vswitch-idl.c \
lib/vlog.c \
lib/vlog.h \
lib/vswitch-idl.c \
- lib/vswitch-idl.h
+ lib/vswitch-idl.h \
+ lib/vtep-idl.c \
+ lib/vtep-idl.h
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
@@
-257,6
+272,12
@@
lib_libopenvswitch_a_SOURCES += \
lib/route-table.h
endif
lib/route-table.h
endif
+if HAVE_POSIX_AIO
+lib_libopenvswitch_a_SOURCES += lib/async-append-aio.c
+else
+lib_libopenvswitch_a_SOURCES += lib/async-append-null.c
+endif
+
if ESX
lib_libopenvswitch_a_SOURCES += \
lib/route-table-stub.c
if ESX
lib_libopenvswitch_a_SOURCES += \
lib/route-table-stub.c
@@
-317,7
+338,10
@@
MAN_FRAGMENTS += \
OVSIDL_BUILT += \
$(srcdir)/lib/vswitch-idl.c \
$(srcdir)/lib/vswitch-idl.h \
OVSIDL_BUILT += \
$(srcdir)/lib/vswitch-idl.c \
$(srcdir)/lib/vswitch-idl.h \
- $(srcdir)/lib/vswitch-idl.ovsidl
+ $(srcdir)/lib/vswitch-idl.ovsidl \
+ $(srcdir)/lib/vtep-idl.c \
+ $(srcdir)/lib/vtep-idl.h \
+ $(srcdir)/lib/vtep-idl.ovsidl
EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
VSWITCH_IDL_FILES = \
EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
VSWITCH_IDL_FILES = \
@@
-327,6
+351,14
@@
$(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
mv $@.tmp $@
$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
mv $@.tmp $@
+EXTRA_DIST += $(srcdir)/lib/vtep-idl.ann
+VTEP_IDL_FILES = \
+ $(srcdir)/vtep/vtep.ovsschema \
+ $(srcdir)/lib/vtep-idl.ann
+$(srcdir)/lib/vtep-idl.ovsidl: $(VTEP_IDL_FILES)
+ $(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp
+ mv $@.tmp $@
+
lib/dirs.c: lib/dirs.c.in Makefile
($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
-e 's,[@]srcdir[@],$(srcdir),g' \
lib/dirs.c: lib/dirs.c.in Makefile
($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
-e 's,[@]srcdir[@],$(srcdir),g' \