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
ebf3f9d
..
ac583c2
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/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 \
@@
-190,12
+188,10
@@
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/stdio.c \
lib/stream.c \
lib/stream.h \
lib/stdio.c \
@@
-244,11
+240,16
@@
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/latch-windows.c \
+ lib/stream-fd-windows.c
else
lib_libopenvswitch_la_SOURCES += \
lib/daemon.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 += \
endif
EXTRA_DIST += \