git://git.onelab.eu / sliver-openvswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4410d91 908ff19)
Merge remote-tracking branch 'origin/ovs-dev' into bsd-port bsd-port
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 30 Jun 2012 12:10:38 +0000 (14:10 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 30 Jun 2012 12:10:38 +0000 (14:10 +0200)
Conflicts:
acinclude.m4
lib/automake.mk

1  2 
lib/automake.mk patch | diff1 | diff2 | blob | history

diff --cc lib/automake.mk
index c6db53b,feac1d4..be8602b
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -238,9 -240,7 +240,10 @@@ endi
  
  if HAVE_IF_DL
  lib_libopenvswitch_a_SOURCES += \
 +      lib/netdev-bsd.c \
 +      lib/rtbsd.c \
 +      lib/rtbsd.h
+       lib/route-table-bsd.c
  endif
  
  if HAVE_OPENSSL
sliver-openvswitch