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 'master' of git://openvswitch.org/openvswitch
[sliver-openvswitch.git]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index
73234bd
..
cd50e91
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-10,6
+10,7
@@
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/backtrace.c \
lib/backtrace.h \
lib/bfd.c \
@@
-71,6
+72,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
+93,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 \
@@
-121,6
+126,13
@@
lib_libopenvswitch_a_SOURCES = \
lib/ofp-version-opt.c \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ofp-version-opt.c \
lib/ofpbuf.c \
lib/ofpbuf.h \
+ lib/ovs-atomic-c11.h \
+ lib/ovs-atomic-gcc4+.c \
+ lib/ovs-atomic-gcc4+.h \
+ lib/ovs-atomic-gcc4.7+.h \
+ lib/ovs-atomic-pthreads.c \
+ lib/ovs-atomic-pthreads.h \
+ lib/ovs-atomic.h \
lib/ovs-thread.c \
lib/ovs-thread.h \
lib/ovsdb-data.c \
lib/ovs-thread.c \
lib/ovs-thread.h \
lib/ovsdb-data.c \
@@
-175,22
+187,20
@@
lib_libopenvswitch_a_SOURCES = \
lib/stream-unix.c \
lib/stream.c \
lib/stream.h \
lib/stream-unix.c \
lib/stream.c \
lib/stream.h \
- lib/stress.c \
- lib/stress.h \
lib/string.c \
lib/string.h \
lib/svec.c \
lib/svec.h \
lib/table.c \
lib/table.h \
lib/string.c \
lib/string.h \
lib/svec.c \
lib/svec.h \
lib/table.c \
lib/table.h \
- lib/tag.c \
- lib/tag.h \
lib/timer.c \
lib/timer.h \
lib/timeval.c \
lib/timeval.h \
lib/token-bucket.c \
lib/token-bucket.h \
lib/timer.c \
lib/timer.h \
lib/timeval.c \
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 \
@@
-213,9
+223,7
@@
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/worker.c \
- lib/worker.h
+ lib/vswitch-idl.h
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
@@
-254,6
+262,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
@@
-301,7
+315,6
@@
MAN_FRAGMENTS += \
lib/ssl-peer-ca-cert.man \
lib/ssl.man \
lib/ssl-syn.man \
lib/ssl-peer-ca-cert.man \
lib/ssl.man \
lib/ssl-syn.man \
- lib/stress-unixctl.man \
lib/table.man \
lib/unixctl.man \
lib/unixctl-syn.man \
lib/table.man \
lib/unixctl.man \
lib/unixctl-syn.man \
@@
-378,11
+391,6
@@
lib/coverage.def: $(DIST_SOURCES)
sed -n 's|^COVERAGE_DEFINE(\([_a-zA-Z0-9]\{1,\}\)).*$$|COVERAGE_COUNTER(\1)|p' $(all_sources) | LC_ALL=C sort -u > $@
CLEANFILES += lib/coverage.def
sed -n 's|^COVERAGE_DEFINE(\([_a-zA-Z0-9]\{1,\}\)).*$$|COVERAGE_COUNTER(\1)|p' $(all_sources) | LC_ALL=C sort -u > $@
CLEANFILES += lib/coverage.def
-lib/stress.$(OBJEXT): lib/stress.def
-lib/stress.def: $(DIST_SOURCES)
- sed -n '/^STRESS_OPTION(/,/);$$/{s/);$$/)/;p}' $(all_sources) > $@
-CLEANFILES += lib/stress.def
-
lib/vlog.$(OBJEXT): lib/vlog-modules.def
lib/vlog-modules.def: $(DIST_SOURCES)
sed -n 's|^VLOG_DEFINE_\(THIS_\)\{0,1\}MODULE(\([_a-zA-Z0-9]\{1,\}\)).*$$|VLOG_MODULE(\2)|p' $(all_sources) | LC_ALL=C sort -u > $@
lib/vlog.$(OBJEXT): lib/vlog-modules.def
lib/vlog-modules.def: $(DIST_SOURCES)
sed -n 's|^VLOG_DEFINE_\(THIS_\)\{0,1\}MODULE(\([_a-zA-Z0-9]\{1,\}\)).*$$|VLOG_MODULE(\2)|p' $(all_sources) | LC_ALL=C sort -u > $@