X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=fa7f17332f63efdcc942f2326df6485b40285f29;hb=fa04edcedfe5285fd8ad3a4d70fecb38df18293d;hp=bcaa1f8e5e43b3271d50773be97c132331b97d41;hpb=f094af7b17631ce688595d7cf70235a3eed9798c;p=sliver-openvswitch.git

diff --git a/lib/automake.mk b/lib/automake.mk
index bcaa1f8e5..fa7f17332 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -10,6 +10,7 @@ noinst_LIBRARIES += lib/libopenvswitch.a
 lib_libopenvswitch_a_SOURCES = \
 	lib/aes128.c \
 	lib/aes128.h \
+	lib/async-append.h \
 	lib/backtrace.c \
 	lib/backtrace.h \
 	lib/bfd.c \
@@ -57,6 +58,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/flow.h \
 	lib/hash.c \
 	lib/hash.h \
+	lib/hindex.c \
+	lib/hindex.h \
 	lib/hmap.c \
 	lib/hmap.h \
 	lib/hmapx.c \
@@ -69,8 +72,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/jsonrpc.h \
 	lib/lacp.c \
 	lib/lacp.h \
-	lib/leak-checker.c \
-	lib/leak-checker.h \
+	lib/latch.c \
+	lib/latch.h \
 	lib/learn.c \
 	lib/learn.h \
 	lib/learning-switch.c \
@@ -90,6 +93,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 \
@@ -121,6 +126,15 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/ofp-version-opt.c \
 	lib/ofpbuf.c \
 	lib/ofpbuf.h \
+	lib/ovs-atomic-c11.h \
+	lib/ovs-atomic-gcc4+.c \
+	lib/ovs-atomic-gcc4+.h \
+	lib/ovs-atomic-gcc4.7+.h \
+	lib/ovs-atomic-pthreads.c \
+	lib/ovs-atomic-pthreads.h \
+	lib/ovs-atomic.h \
+	lib/ovs-thread.c \
+	lib/ovs-thread.h \
 	lib/ovsdb-data.c \
 	lib/ovsdb-data.h \
 	lib/ovsdb-error.c \
@@ -147,6 +161,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 \
@@ -173,22 +189,20 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/stream-unix.c \
 	lib/stream.c \
 	lib/stream.h \
-	lib/stress.c \
-	lib/stress.h \
 	lib/string.c \
 	lib/string.h \
 	lib/svec.c \
 	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 \
@@ -211,9 +225,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/vlog.c \
 	lib/vlog.h \
 	lib/vswitch-idl.c \
-	lib/vswitch-idl.h \
-	lib/worker.c \
-	lib/worker.h
+	lib/vswitch-idl.h
 
 nodist_lib_libopenvswitch_a_SOURCES = \
 	lib/dirs.c
@@ -252,6 +264,12 @@ lib_libopenvswitch_a_SOURCES += \
 	lib/route-table.h
 endif
 
+if HAVE_POSIX_AIO
+lib_libopenvswitch_a_SOURCES += lib/async-append-aio.c
+else
+lib_libopenvswitch_a_SOURCES += lib/async-append-null.c
+endif
+
 if ESX
 lib_libopenvswitch_a_SOURCES += \
         lib/route-table-stub.c
@@ -291,7 +309,6 @@ MAN_FRAGMENTS += \
 	lib/coverage-unixctl.man \
 	lib/daemon.man \
 	lib/daemon-syn.man \
-	lib/leak-checker.man \
 	lib/memory-unixctl.man \
 	lib/ofp-version.man \
 	lib/ovs.tmac \
@@ -300,7 +317,6 @@ MAN_FRAGMENTS += \
 	lib/ssl-peer-ca-cert.man \
 	lib/ssl.man \
 	lib/ssl-syn.man \
-	lib/stress-unixctl.man \
 	lib/table.man \
 	lib/unixctl.man \
 	lib/unixctl-syn.man \
@@ -337,9 +353,12 @@ lib/dirs.c: lib/dirs.c.in Makefile
 	mv lib/dirs.c.tmp lib/dirs.c
 
 $(srcdir)/lib/ofp-errors.inc: \
-	lib/ofp-errors.h $(srcdir)/build-aux/extract-ofp-errors
+	lib/ofp-errors.h include/openflow/openflow-common.h \
+	$(srcdir)/build-aux/extract-ofp-errors
 	$(run_python) $(srcdir)/build-aux/extract-ofp-errors \
-		$(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
+		$(srcdir)/lib/ofp-errors.h \
+		$(srcdir)/include/openflow/openflow-common.h > $@.tmp
+	mv $@.tmp $@
 $(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
 EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
 
@@ -374,11 +393,6 @@ lib/coverage.def: $(DIST_SOURCES)
 	sed -n 's|^COVERAGE_DEFINE(\([_a-zA-Z0-9]\{1,\}\)).*$$|COVERAGE_COUNTER(\1)|p' $(all_sources) | LC_ALL=C sort -u > $@
 CLEANFILES += lib/coverage.def
 
-lib/stress.$(OBJEXT): lib/stress.def
-lib/stress.def: $(DIST_SOURCES)
-	sed -n '/^STRESS_OPTION(/,/);$$/{s/);$$/)/;p}' $(all_sources) > $@
-CLEANFILES += lib/stress.def
-
 lib/vlog.$(OBJEXT): lib/vlog-modules.def
 lib/vlog-modules.def: $(DIST_SOURCES)
 	sed -n 's|^VLOG_DEFINE_\(THIS_\)\{0,1\}MODULE(\([_a-zA-Z0-9]\{1,\}\)).*$$|VLOG_MODULE(\2)|p' $(all_sources) | LC_ALL=C sort -u > $@