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
a45f09d
..
8950c05
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-10,8
+10,6
@@
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/backtrace.c \
lib/backtrace.h \
lib/bitmap.c \
lib/backtrace.c \
lib/backtrace.h \
lib/bitmap.c \
@@
-61,6
+59,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/hmap.h \
lib/hmapx.c \
lib/hmapx.h \
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/json.c \
lib/json.h \
lib/jsonrpc.c \
@@
-88,7
+88,11
@@
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-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 \
@@
-111,6
+115,8
@@
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/ovsdb-data.c \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovsdb-data.c \
@@
-126,8
+132,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 \
@@
-181,6
+187,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 \
@@
-227,14
+235,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 \
@@
-246,6
+252,11
@@
lib_libopenvswitch_a_SOURCES += \
lib/route-table.h
endif
lib/route-table.h
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 \
if HAVE_IF_DL
lib_libopenvswitch_a_SOURCES += \
lib/netdev-bsd.c \
@@
-282,6
+293,7
@@
MAN_FRAGMENTS += \
lib/daemon-syn.man \
lib/leak-checker.man \
lib/memory-unixctl.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/ovs.tmac \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
@@
-305,9
+317,11
@@
OVSIDL_BUILT += \
$(srcdir)/lib/vswitch-idl.ovsidl
EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
$(srcdir)/lib/vswitch-idl.ovsidl
EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
-VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema $(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)
$(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
- $(OVSDB_IDLC)
-C $(srcdir)
annotate $(VSWITCH_IDL_FILES) > $@.tmp
+ $(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