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
ofproto-dpif: Use sequence number to wake up main thread for
[sliver-openvswitch.git]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index
6c5ad8d
..
de3f068
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-8,6
+8,11
@@
lib_LTLIBRARIES += lib/libopenvswitch.la
lib_libopenvswitch_la_LIBADD = $(SSL_LIBS)
lib_LTLIBRARIES += lib/libopenvswitch.la
lib_libopenvswitch_la_LIBADD = $(SSL_LIBS)
+
+if WIN32
+lib_libopenvswitch_la_LIBADD += ${PTHREAD_LIBS}
+endif
+
lib_libopenvswitch_la_LDFLAGS = -release $(VERSION)
lib_libopenvswitch_la_SOURCES = \
lib_libopenvswitch_la_LDFLAGS = -release $(VERSION)
lib_libopenvswitch_la_SOURCES = \
@@
-40,13
+45,16
@@
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/daemon.h \
+ lib/daemon-private.h \
lib/dhcp.h \
lib/dummy.c \
lib/dummy.h \
lib/dhparams.h \
lib/dirs.h \
lib/dpif-netdev.c \
lib/dhcp.h \
lib/dummy.c \
lib/dummy.h \
lib/dhparams.h \
lib/dirs.h \
lib/dpif-netdev.c \
+ lib/dpif-netdev.h \
lib/dpif-provider.h \
lib/dpif.c \
lib/dpif.h \
lib/dpif-provider.h \
lib/dpif.c \
lib/dpif.h \
@@
-134,12
+142,14
@@
lib_libopenvswitch_la_SOURCES = \
lib/ovs-atomic-c11.h \
lib/ovs-atomic-clang.h \
lib/ovs-atomic-flag-gcc4.7+.h \
lib/ovs-atomic-c11.h \
lib/ovs-atomic-clang.h \
lib/ovs-atomic-flag-gcc4.7+.h \
- lib/ovs-atomic-gcc4+.c \
lib/ovs-atomic-gcc4+.h \
lib/ovs-atomic-gcc4.7+.h \
lib/ovs-atomic-gcc4+.h \
lib/ovs-atomic-gcc4.7+.h \
- lib/ovs-atomic-pthreads.c \
+ lib/ovs-atomic-locked.c \
+ lib/ovs-atomic-locked.h \
lib/ovs-atomic-pthreads.h \
lib/ovs-atomic.h \
lib/ovs-atomic-pthreads.h \
lib/ovs-atomic.h \
+ lib/ovs-rcu.c \
+ lib/ovs-rcu.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 \
@@
-176,8
+186,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,7
+196,6
@@
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-fd.h \
lib/stream-provider.h \
lib/stream-ssl.h \
@@
-239,11
+246,18
@@
if WIN32
lib_libopenvswitch_la_SOURCES += \
lib/daemon-windows.c \
lib/getopt_long.c \
lib_libopenvswitch_la_SOURCES += \
lib/daemon-windows.c \
lib/getopt_long.c \
- lib/latch-windows.c
+ lib/getrusage-windows.c \
+ lib/latch-windows.c \
+ lib/route-table-stub.c \
+ lib/strsep.c \
+ lib/stream-fd-windows.c
else
lib_libopenvswitch_la_SOURCES += \
else
lib_libopenvswitch_la_SOURCES += \
- lib/daemon.c \
- lib/latch.c \
+ lib/daemon-unix.c \
+ lib/latch-unix.c \
+ lib/signals.c \
+ lib/signals.h \
+ lib/stream-fd-unix.c \
lib/stream-unix.c
endif
lib/stream-unix.c
endif
@@
-273,7
+287,7
@@
if HAVE_WNO_UNUSED_PARAMETER
lib_libsflow_la_CFLAGS += -Wno-unused-parameter
endif
lib_libsflow_la_CFLAGS += -Wno-unused-parameter
endif
-if LINUX
_DATAPATH
+if LINUX
lib_libopenvswitch_la_SOURCES += \
lib/dpif-linux.c \
lib/dpif-linux.h \
lib_libopenvswitch_la_SOURCES += \
lib/dpif-linux.c \
lib/dpif-linux.h \
@@
-290,6
+304,12
@@
lib_libopenvswitch_la_SOURCES += \
lib/route-table.h
endif
lib/route-table.h
endif
+if DPDK_NETDEV
+lib_libopenvswitch_la_SOURCES += \
+ lib/netdev-dpdk.c \
+ lib/netdev-dpdk.h
+endif
+
if HAVE_POSIX_AIO
lib_libopenvswitch_la_SOURCES += lib/async-append-aio.c
else
if HAVE_POSIX_AIO
lib_libopenvswitch_la_SOURCES += lib/async-append-aio.c
else