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
6217526
..
fa7f173
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-1,4
+1,4
@@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
@@
-10,10
+10,11
@@
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/async-append.h \
lib/backtrace.c \
lib/backtrace.h \
lib/backtrace.c \
lib/backtrace.h \
+ lib/bfd.c \
+ lib/bfd.h \
lib/bitmap.c \
lib/bitmap.h \
lib/bond.c \
lib/bitmap.c \
lib/bitmap.h \
lib/bond.c \
@@
-57,18
+58,22
@@
lib_libopenvswitch_a_SOURCES = \
lib/flow.h \
lib/hash.c \
lib/hash.h \
lib/flow.h \
lib/hash.c \
lib/hash.h \
+ lib/hindex.c \
+ lib/hindex.h \
lib/hmap.c \
lib/hmap.h \
lib/hmapx.c \
lib/hmapx.h \
lib/hmap.c \
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/jsonrpc.h \
lib/lacp.c \
lib/lacp.h \
lib/json.c \
lib/json.h \
lib/jsonrpc.c \
lib/jsonrpc.h \
lib/lacp.c \
lib/lacp.h \
- lib/l
eak-checker
.c \
- lib/l
eak-checker
.h \
+ lib/l
atch
.c \
+ lib/l
atch
.h \
lib/learn.c \
lib/learn.h \
lib/learning-switch.c \
lib/learn.c \
lib/learn.h \
lib/learning-switch.c \
@@
-79,12
+84,20
@@
lib_libopenvswitch_a_SOURCES = \
lib/lockfile.h \
lib/mac-learning.c \
lib/mac-learning.h \
lib/lockfile.h \
lib/mac-learning.c \
lib/mac-learning.h \
+ lib/match.c \
+ lib/match.h \
+ lib/memory.c \
+ lib/memory.h \
lib/meta-flow.c \
lib/meta-flow.h \
lib/multipath.c \
lib/multipath.h \
lib/netdev-dummy.c \
lib/meta-flow.c \
lib/meta-flow.h \
lib/multipath.c \
lib/multipath.h \
lib/netdev-dummy.c \
+ lib/netdev-tunnel.c \
+ lib/netdev-pltap.c \
lib/netdev-provider.h \
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 \
@@
-92,10
+105,16
@@
lib_libopenvswitch_a_SOURCES = \
lib/netlink.h \
lib/nx-match.c \
lib/nx-match.h \
lib/netlink.h \
lib/nx-match.c \
lib/nx-match.h \
+ lib/odp-execute.c \
+ lib/odp-execute.h \
lib/odp-util.c \
lib/odp-util.h \
lib/odp-util.c \
lib/odp-util.h \
+ lib/ofp-actions.c \
+ lib/ofp-actions.h \
lib/ofp-errors.c \
lib/ofp-errors.h \
lib/ofp-errors.c \
lib/ofp-errors.h \
+ lib/ofp-msgs.c \
+ lib/ofp-msgs.h \
lib/ofp-parse.c \
lib/ofp-parse.h \
lib/ofp-print.c \
lib/ofp-parse.c \
lib/ofp-parse.h \
lib/ofp-print.c \
@@
-103,8
+122,19
@@
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/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/ovsdb-data.h \
lib/ovsdb-error.c \
lib/ovsdb-data.c \
lib/ovsdb-data.h \
lib/ovsdb-error.c \
@@
-118,8
+148,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/ovsdb-types.h \
lib/packets.c \
lib/packets.h \
lib/ovsdb-types.h \
lib/packets.c \
lib/packets.h \
- lib/pcap.c \
- lib/pcap.h \
+ lib/pcap
-file
.c \
+ lib/pcap
-file
.h \
lib/poll-loop.c \
lib/poll-loop.h \
lib/process.c \
lib/poll-loop.c \
lib/poll-loop.h \
lib/process.c \
@@
-131,12
+161,18
@@
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/shash.h \
lib/sha1.c \
lib/sha1.h \
lib/shash.c \
lib/shash.h \
+ lib/simap.c \
+ lib/simap.h \
lib/signals.c \
lib/signals.h \
lib/signals.c \
lib/signals.h \
+ lib/smap.c \
+ lib/smap.h \
lib/socket-util.c \
lib/socket-util.h \
lib/sort.c \
lib/socket-util.c \
lib/socket-util.h \
lib/sort.c \
@@
-153,20
+189,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/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 \
@@
-211,14
+247,12
@@
if HAVE_WNO_UNUSED_PARAMETER
lib_libsflow_a_CFLAGS += -Wno-unused-parameter
endif
lib_libsflow_a_CFLAGS += -Wno-unused-parameter
endif
-if
HAVE_NETLINK
+if
LINUX_DATAPATH
lib_libopenvswitch_a_SOURCES += \
lib/dpif-linux.c \
lib/dpif-linux.h \
lib/netdev-linux.c \
lib/netdev-linux.h \
lib_libopenvswitch_a_SOURCES += \
lib/dpif-linux.c \
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 \
@@
-230,6
+264,25
@@
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
+endif
+
+if HAVE_IF_DL
+lib_libopenvswitch_a_SOURCES += \
+ lib/netdev-bsd.c \
+ lib/rtbsd.c \
+ lib/rtbsd.h \
+ lib/route-table-bsd.c
+endif
+
if HAVE_OPENSSL
lib_libopenvswitch_a_SOURCES += lib/stream-ssl.c
nodist_lib_libopenvswitch_a_SOURCES += lib/dhparams.c
if HAVE_OPENSSL
lib_libopenvswitch_a_SOURCES += lib/stream-ssl.c
nodist_lib_libopenvswitch_a_SOURCES += lib/dhparams.c
@@
-256,14
+309,14
@@
MAN_FRAGMENTS += \
lib/coverage-unixctl.man \
lib/daemon.man \
lib/daemon-syn.man \
lib/coverage-unixctl.man \
lib/daemon.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/ssl-peer-ca-cert.man \
lib/ssl.man \
lib/ssl-syn.man \
lib/ovs.tmac \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-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 \
@@
-275,14
+328,16
@@
MAN_FRAGMENTS += \
# vswitch IDL
OVSIDL_BUILT += \
# vswitch IDL
OVSIDL_BUILT += \
- lib/vswitch-idl.c \
- lib/vswitch-idl.h \
- lib/vswitch-idl.ovsidl
+
$(srcdir)/
lib/vswitch-idl.c \
+
$(srcdir)/
lib/vswitch-idl.h \
+
$(srcdir)/
lib/vswitch-idl.ovsidl
-EXTRA_DIST += lib/vswitch-idl.ann
-VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema lib/vswitch-idl.ann
-lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
- $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
+VSWITCH_IDL_FILES = \
+ $(srcdir)/vswitchd/vswitch.ovsschema \
+ $(srcdir)/lib/vswitch-idl.ann
+$(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
+ $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
mv $@.tmp $@
lib/dirs.c: lib/dirs.c.in Makefile
mv $@.tmp $@
lib/dirs.c: lib/dirs.c.in Makefile
@@
-290,6
+345,7
@@
lib/dirs.c: lib/dirs.c.in Makefile
-e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
-e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
+ -e 's,[@]DBDIR[@],"$(DBDIR)",g' \
-e 's,[@]bindir[@],"$(bindir)",g' \
-e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
-e 's,[@]bindir[@],"$(bindir)",g' \
-e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
@@
-297,17
+353,28
@@
lib/dirs.c: lib/dirs.c.in Makefile
mv lib/dirs.c.tmp lib/dirs.c
$(srcdir)/lib/ofp-errors.inc: \
mv lib/dirs.c.tmp lib/dirs.c
$(srcdir)/lib/ofp-errors.inc: \
- lib/ofp-errors.h $(srcdir)/build-aux/extract-ofp-errors
- $(PYTHON) $(srcdir)/build-aux/extract-ofp-errors \
- $(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
+ lib/ofp-errors.h include/openflow/openflow-common.h \
+ $(srcdir)/build-aux/extract-ofp-errors
+ $(run_python) $(srcdir)/build-aux/extract-ofp-errors \
+ $(srcdir)/lib/ofp-errors.h \
+ $(srcdir)/include/openflow/openflow-common.h > $@.tmp
+ mv $@.tmp $@
$(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
$(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
+$(srcdir)/lib/ofp-msgs.inc: \
+ lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs
+ $(run_python) $(srcdir)/build-aux/extract-ofp-msgs \
+ $(srcdir)/lib/ofp-msgs.h $@ > $@.tmp && mv $@.tmp $@
+$(srcdir)/lib/ofp-msgs.c: $(srcdir)/lib/ofp-msgs.inc
+EXTRA_DIST += build-aux/extract-ofp-msgs lib/ofp-msgs.inc
+
INSTALL_DATA_LOCAL += lib-install-data-local
lib-install-data-local:
$(MKDIR_P) $(DESTDIR)$(RUNDIR)
$(MKDIR_P) $(DESTDIR)$(PKIDIR)
$(MKDIR_P) $(DESTDIR)$(LOGDIR)
INSTALL_DATA_LOCAL += lib-install-data-local
lib-install-data-local:
$(MKDIR_P) $(DESTDIR)$(RUNDIR)
$(MKDIR_P) $(DESTDIR)$(PKIDIR)
$(MKDIR_P) $(DESTDIR)$(LOGDIR)
+ $(MKDIR_P) $(DESTDIR)$(DBDIR)
if !USE_LINKER_SECTIONS
# All distributed sources, with names adjust properly for referencing
if !USE_LINKER_SECTIONS
# All distributed sources, with names adjust properly for referencing
@@
-326,11
+393,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 > $@