X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=lib%2Fautomake.mk;h=75608a8d8059b916edb7d603395f51f4c1f7f577;hb=6b4b2f598246e87237342a9179a0d29e202ebe65;hp=da1896a2e22716059faff9f4afba0f9ca441e8f2;hpb=29ab0cf77c2a03e1c5e61f8899c33ad74762a710;p=sliver-openvswitch.git

diff --git a/lib/automake.mk b/lib/automake.mk
index da1896a2e..75608a8d8 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -17,8 +17,6 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/bfd.h \
 	lib/bitmap.c \
 	lib/bitmap.h \
-	lib/bond.c \
-	lib/bond.h \
 	lib/bundle.c \
 	lib/bundle.h \
 	lib/byte-order.h \
@@ -58,6 +56,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/fatal-signal.h \
 	lib/flow.c \
 	lib/flow.h \
+	lib/guarded-list.c \
+	lib/guarded-list.h \
 	lib/hash.c \
 	lib/hash.h \
 	lib/hindex.c \
@@ -95,6 +95,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/multipath.c \
 	lib/multipath.h \
 	lib/netdev-dummy.c \
+	lib/netdev-tunnel.c \
+	lib/netdev-pltap.c \
 	lib/netdev-provider.h \
 	lib/netdev-vport.c \
 	lib/netdev-vport.h \
@@ -197,12 +199,16 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/svec.h \
 	lib/table.c \
 	lib/table.h \
+	lib/tag.c \
+	lib/tag.h \
 	lib/timer.c \
 	lib/timer.h \
 	lib/timeval.c \
 	lib/timeval.h \
 	lib/token-bucket.c \
 	lib/token-bucket.h \
+	lib/tunalloc.c \
+	lib/tunalloc.h \
 	lib/type-props.h \
 	lib/unaligned.h \
 	lib/unicode.c \
@@ -225,7 +231,9 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/vlog.c \
 	lib/vlog.h \
 	lib/vswitch-idl.c \
-	lib/vswitch-idl.h
+	lib/vswitch-idl.h \
+	lib/vtep-idl.c \
+	lib/vtep-idl.h
 
 nodist_lib_libopenvswitch_a_SOURCES = \
 	lib/dirs.c
@@ -330,7 +338,10 @@ MAN_FRAGMENTS += \
 OVSIDL_BUILT += \
 	$(srcdir)/lib/vswitch-idl.c \
 	$(srcdir)/lib/vswitch-idl.h \
-	$(srcdir)/lib/vswitch-idl.ovsidl
+	$(srcdir)/lib/vswitch-idl.ovsidl \
+	$(srcdir)/lib/vtep-idl.c \
+	$(srcdir)/lib/vtep-idl.h \
+	$(srcdir)/lib/vtep-idl.ovsidl
 
 EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
 VSWITCH_IDL_FILES = \
@@ -340,6 +351,14 @@ $(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
 	$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
 	mv $@.tmp $@
 
+EXTRA_DIST += $(srcdir)/lib/vtep-idl.ann
+VTEP_IDL_FILES = \
+	$(srcdir)/vtep/vtep.ovsschema \
+	$(srcdir)/lib/vtep-idl.ann
+$(srcdir)/lib/vtep-idl.ovsidl: $(VTEP_IDL_FILES)
+	$(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp
+	mv $@.tmp $@
+
 lib/dirs.c: lib/dirs.c.in Makefile
 	($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
 		-e 's,[@]srcdir[@],$(srcdir),g' \