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

diff --git a/lib/automake.mk b/lib/automake.mk
index 22a9b65b8..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 \
@@ -33,6 +31,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/compiler.h \
 	lib/coverage.c \
 	lib/coverage.h \
+	lib/crc32c.c \
+	lib/crc32c.h \
 	lib/csum.c \
 	lib/csum.h \
 	lib/daemon.c \
@@ -56,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 \
@@ -127,6 +129,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/ofpbuf.c \
 	lib/ofpbuf.h \
 	lib/ovs-atomic-c11.h \
+	lib/ovs-atomic-clang.h \
+	lib/ovs-atomic-flag-gcc4.7+.h \
 	lib/ovs-atomic-gcc4+.c \
 	lib/ovs-atomic-gcc4+.h \
 	lib/ovs-atomic-gcc4.7+.h \
@@ -161,6 +165,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/reconnect.c \
 	lib/reconnect.h \
 	lib/sat-math.h \
+	lib/seq.c \
+	lib/seq.h \
 	lib/sha1.c \
 	lib/sha1.h \
 	lib/shash.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
@@ -267,7 +275,7 @@ endif
 if HAVE_POSIX_AIO
 lib_libopenvswitch_a_SOURCES += lib/async-append-aio.c
 else
-lib_libopenvswitch_a_SOURCES += lib/async-append-sync.c
+lib_libopenvswitch_a_SOURCES += lib/async-append-null.c
 endif
 
 if ESX
@@ -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' \