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
5eece1c
..
ac583c2
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-1,4
+1,4
@@
-# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013
, 2014
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
@@
-40,7
+40,6
@@
lib_libopenvswitch_la_SOURCES = \
lib/crc32c.h \
lib/csum.c \
lib/csum.h \
lib/crc32c.h \
lib/csum.c \
lib/csum.h \
- lib/daemon.c \
lib/daemon.h \
lib/dhcp.h \
lib/dummy.c \
lib/daemon.h \
lib/dhcp.h \
lib/dummy.c \
@@
-57,6
+56,8
@@
lib_libopenvswitch_la_SOURCES = \
lib/dynamic-string.h \
lib/entropy.c \
lib/entropy.h \
lib/dynamic-string.h \
lib/entropy.c \
lib/entropy.h \
+ lib/fat-rwlock.c \
+ lib/fat-rwlock.h \
lib/fatal-signal.c \
lib/fatal-signal.h \
lib/flow.c \
lib/fatal-signal.c \
lib/fatal-signal.h \
lib/flow.c \
@@
-79,7
+80,6
@@
lib_libopenvswitch_la_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/latch.h \
lib/learn.c \
lib/learn.h \
@@
-100,6
+100,8
@@
lib_libopenvswitch_la_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 \
@@
-176,8
+178,6
@@
lib_libopenvswitch_la_SOURCES = \
lib/shash.h \
lib/simap.c \
lib/simap.h \
lib/shash.h \
lib/simap.c \
lib/simap.h \
- lib/signals.c \
- lib/signals.h \
lib/smap.c \
lib/smap.h \
lib/socket-util.c \
lib/smap.c \
lib/smap.h \
lib/socket-util.c \
@@
-188,14
+188,13
@@
lib_libopenvswitch_la_SOURCES = \
lib/sset.h \
lib/stp.c \
lib/stp.h \
lib/sset.h \
lib/stp.c \
lib/stp.h \
- lib/stream-fd.c \
lib/stream-fd.h \
lib/stream-provider.h \
lib/stream-ssl.h \
lib/stream-tcp.c \
lib/stream-fd.h \
lib/stream-provider.h \
lib/stream-ssl.h \
lib/stream-tcp.c \
- lib/stream-unix.c \
lib/stream.c \
lib/stream.h \
lib/stream.c \
lib/stream.h \
+ lib/stdio.c \
lib/string.c \
lib/svec.c \
lib/svec.h \
lib/string.c \
lib/svec.c \
lib/svec.h \
@@
-209,6
+208,8
@@
lib_libopenvswitch_la_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 \
@@
-234,7
+235,26
@@
lib_libopenvswitch_la_SOURCES = \
lib/vswitch-idl.h \
lib/vtep-idl.c \
lib/vtep-idl.h
lib/vswitch-idl.h \
lib/vtep-idl.c \
lib/vtep-idl.h
-EXTRA_DIST += lib/string.h.in
+
+if WIN32
+lib_libopenvswitch_la_SOURCES += \
+ lib/daemon-windows.c \
+ lib/getopt_long.c \
+ lib/latch-windows.c \
+ lib/stream-fd-windows.c
+else
+lib_libopenvswitch_la_SOURCES += \
+ lib/daemon.c \
+ lib/latch-unix.c \
+ lib/signals.c \
+ lib/signals.h \
+ lib/stream-fd-unix.c \
+ lib/stream-unix.c
+endif
+
+EXTRA_DIST += \
+ lib/stdio.h.in \
+ lib/string.h.in
nodist_lib_libopenvswitch_la_SOURCES = \
lib/dirs.c
nodist_lib_libopenvswitch_la_SOURCES = \
lib/dirs.c
@@
-323,6
+343,8
@@
MAN_FRAGMENTS += \
lib/memory-unixctl.man \
lib/ofp-version.man \
lib/ovs.tmac \
lib/memory-unixctl.man \
lib/ofp-version.man \
lib/ovs.tmac \
+ lib/service.man \
+ lib/service-syn.man \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
lib/ssl-peer-ca-cert.man \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
lib/ssl-peer-ca-cert.man \