datapath: Try to avoid custom checksum update function.

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 6555661..0d42e20 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -26,7 +26,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/compiler.h \
        lib/coverage.c \
        lib/coverage.h \
-       lib/coverage-counters.h \
        lib/csum.c \
        lib/csum.h \
        lib/daemon.c \
@@ -103,12 +102,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/pcap.h \
        lib/poll-loop.c \
        lib/poll-loop.h \
-       lib/port-array.c \
-       lib/port-array.h \
        lib/process.c \
        lib/process.h \
-       lib/queue.c \
-       lib/queue.h \
        lib/random.c \
        lib/random.h \
        lib/rconn.c \
@@ -134,6 +129,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/stream-unix.c \
        lib/stream.c \
        lib/stream.h \
+       lib/stress.c \
+       lib/stress.h \
        lib/string.h \
        lib/svec.c \
        lib/svec.h \
@@ -159,7 +156,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/vlog.c \
        lib/vlog.h
 nodist_lib_libopenvswitch_a_SOURCES = \
-       lib/coverage-counters.c \
        lib/dirs.c
 CLEANFILES += $(nodist_lib_libopenvswitch_a_SOURCES)
 
@@ -222,6 +218,7 @@ EXTRA_DIST += \
        lib/ssl-peer-ca-cert.man \
        lib/ssl.man \
        lib/ssl-syn.man \
+       lib/stress-unixctl.man \
        lib/unixctl.man \
        lib/unixctl-syn.man \
        lib/vconn-active.man \
@@ -246,6 +243,7 @@ lib-install-data-local:
        $(MKDIR_P) $(DESTDIR)$(PKIDIR)
        $(MKDIR_P) $(DESTDIR)$(LOGDIR)
 
+if !USE_LINKER_SECTIONS
 # All distributed sources, with names adjust properly for referencing
 # from $(builddir).
 all_sources = \
@@ -257,37 +255,16 @@ all_sources = \
                fi; \
         done`
 
-# All the source files that have coverage counters.
-COVERAGE_FILES = \
-       lib/dpif.c \
-       lib/flow.c \
-       lib/lockfile.c \
-       lib/hmap.c \
-       lib/mac-learning.c \
-       lib/netdev.c \
-       lib/netdev-linux.c \
-       lib/netlink.c \
-       lib/odp-util.c \
-       lib/poll-loop.c \
-       lib/process.c \
-       lib/rconn.c \
-       lib/rtnetlink.c \
-       lib/stream.c \
-       lib/stream-ssl.c \
-       lib/timeval.c \
-       lib/unixctl.c \
-       lib/util.c \
-       lib/vconn.c \
-       ofproto/ofproto.c \
-       ofproto/pktbuf.c \
-       vswitchd/bridge.c \
-       vswitchd/ovs-brcompatd.c
-lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
-       (cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp
-       mv $@.tmp $@
-EXTRA_DIST += lib/coverage-scan.pl
+lib/coverage.$(OBJEXT): lib/coverage.def
+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
 
-if !USE_LINKER_SECTIONS
 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 > $@