X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=fa7f17332f63efdcc942f2326df6485b40285f29;hb=fa04edcedfe5285fd8ad3a4d70fecb38df18293d;hp=0804956cfcc8a4f3c814e99ff1485f1687a116b7;hpb=85606e05b691be7c2f2d4bcf0e91170b71ec8fbb;p=sliver-openvswitch.git diff --git a/lib/automake.mk b/lib/automake.mk index 0804956cf..fa7f17332 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -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 \ @@ -71,6 +72,8 @@ lib_libopenvswitch_a_SOURCES = \ lib/jsonrpc.h \ lib/lacp.c \ lib/lacp.h \ + lib/latch.c \ + lib/latch.h \ lib/learn.c \ lib/learn.h \ lib/learning-switch.c \ @@ -158,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 \ @@ -184,16 +189,12 @@ 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 \ @@ -224,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 @@ -265,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 @@ -312,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 \ @@ -389,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 > $@