X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=e904f88369fff37ed17cc97127e0d4045e5f9817;hb=a91dc4447bb6c6bd8807aaaa4e00af0abe4fa5c7;hp=94ba060bc060487c7965e328bbdb224c315b2ea0;hpb=4ca828d713451307fea449be5111272f47c0c5a7;p=sliver-openvswitch.git

diff --git a/lib/automake.mk b/lib/automake.mk
index 94ba060bc..e904f8836 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -8,6 +8,11 @@
 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 = \
@@ -40,7 +45,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/crc32c.h \
 	lib/csum.c \
 	lib/csum.h \
-	lib/daemon.c \
 	lib/daemon.h \
 	lib/dhcp.h \
 	lib/dummy.c \
@@ -48,6 +52,7 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/dhparams.h \
 	lib/dirs.h \
 	lib/dpif-netdev.c \
+	lib/dpif-netdev.h \
 	lib/dpif-provider.h \
 	lib/dpif.c \
 	lib/dpif.h \
@@ -135,12 +140,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-gcc4+.c \
 	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-rcu.c \
+	lib/ovs-rcu.h \
 	lib/ovs-thread.c \
 	lib/ovs-thread.h \
 	lib/ovsdb-data.c \
@@ -177,8 +184,6 @@ lib_libopenvswitch_la_SOURCES = \
 	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 \
@@ -189,12 +194,10 @@ lib_libopenvswitch_la_SOURCES = \
 	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-unix.c \
 	lib/stream.c \
 	lib/stream.h \
 	lib/stdio.c \
@@ -236,10 +239,24 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/vswitch-idl.h \
 	lib/vtep-idl.c \
 	lib/vtep-idl.h
+
 if WIN32
-lib_libopenvswitch_la_SOURCES += lib/latch-windows.c
+lib_libopenvswitch_la_SOURCES += \
+	lib/daemon-windows.c \
+	lib/getopt_long.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 += lib/latch.c
+lib_libopenvswitch_la_SOURCES += \
+	lib/daemon-unix.c \
+	lib/latch-unix.c \
+	lib/signals.c \
+	lib/signals.h \
+	lib/stream-fd-unix.c \
+	lib/stream-unix.c
 endif
 
 EXTRA_DIST += \
@@ -268,7 +285,7 @@ if HAVE_WNO_UNUSED_PARAMETER
 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 \
@@ -285,6 +302,12 @@ lib_libopenvswitch_la_SOURCES += \
 	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
@@ -333,6 +356,8 @@ MAN_FRAGMENTS += \
 	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 \