ovs-atomic: Factor type declarations out of most implementations.

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 94ba060..f4aa9e3 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)
+
+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 \
@@ -140,6 +144,7 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ovs-atomic-gcc4.7+.h \
        lib/ovs-atomic-pthreads.c \
        lib/ovs-atomic-pthreads.h \
+       lib/ovs-atomic-types.h \
        lib/ovs-atomic.h \
        lib/ovs-thread.c \
        lib/ovs-thread.h \
@@ -177,8 +182,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 +192,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 +237,23 @@ 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/stream-fd-windows.c
 else
-lib_libopenvswitch_la_SOURCES += lib/latch.c
+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 += \
@@ -268,7 +282,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 \
@@ -333,6 +347,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 \