Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

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

diff --git a/lib/automake.mk b/lib/automake.mk
index ebf3f9d..9a55b15 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -178,8 +178,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 \
@@ -190,12 +188,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 \
@@ -244,11 +240,17 @@ if WIN32
 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/stream-fd-windows.c
 else
 lib_libopenvswitch_la_SOURCES += \
        lib/daemon.c \
-       lib/latch.c
+       lib/latch-unix.c \
+       lib/signals.c \
+       lib/signals.h \
+       lib/stream-fd-unix.c \
+       lib/stream-unix.c
 endif
 
 EXTRA_DIST += \
@@ -277,7 +279,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 \