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
fb9dde6
..
0804956
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
@@
-12,6
+12,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/aes128.h \
lib/backtrace.c \
lib/backtrace.h \
lib/aes128.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 \
@@
-55,6
+57,8
@@
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/hmap.c \
lib/hmap.h \
lib/hmapx.c \
@@
-67,8
+71,6
@@
lib_libopenvswitch_a_SOURCES = \
lib/jsonrpc.h \
lib/lacp.c \
lib/lacp.h \
lib/jsonrpc.h \
lib/lacp.c \
lib/lacp.h \
- lib/leak-checker.c \
- lib/leak-checker.h \
lib/learn.c \
lib/learn.h \
lib/learning-switch.c \
lib/learn.c \
lib/learn.h \
lib/learning-switch.c \
@@
-100,6
+102,8
@@
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/ofp-actions.c \
lib/odp-util.c \
lib/odp-util.h \
lib/ofp-actions.c \
@@
-119,6
+123,15
@@
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/ovsdb-data.h \
lib/ovsdb-error.c \
lib/ovsdb-data.c \
lib/ovsdb-data.h \
lib/ovsdb-error.c \
@@
-132,8
+145,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 \
@@
-291,7
+304,6
@@
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/memory-unixctl.man \
lib/ofp-version.man \
lib/ovs.tmac \
@@
-337,9
+349,12
@@
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
+ lib/ofp-errors.h include/openflow/openflow-common.h \
+ $(srcdir)/build-aux/extract-ofp-errors
$(run_python) $(srcdir)/build-aux/extract-ofp-errors \
$(run_python) $(srcdir)/build-aux/extract-ofp-errors \
- $(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
+ $(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