From: Ben Pfaff <blp@nicira.com>
Date: Thu, 4 Jun 2009 18:15:39 +0000 (-0700)
Subject: Merge citrix branch into master.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d2185cb5604b3ba56d2d3300eb5d160cfc61bb;p=openvswitch

Merge citrix branch into master.
---

87d2185cb5604b3ba56d2d3300eb5d160cfc61bb
diff --cc lib/automake.mk
index 4851cdf5,b447aa56..4d2924b6
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@@ -159,7 -157,8 +157,8 @@@ install-data-local
  	$(MKDIR_P) $(DESTDIR)$(LOGDIR)
  
  # All the source files that have coverage counters.
 -COVERAGE_SOURCES = \
 +COVERAGE_FILES = \
+ 	lib/cfg.c \
  	lib/dpif.c \
  	lib/flow.c \
  	lib/hmap.c \
@@@ -177,8 -176,9 +176,9 @@@
  	secchan/ofproto.c \
  	secchan/pktbuf.c \
  	vswitchd/bridge.c \
- 	vswitchd/mgmt.c
+ 	vswitchd/mgmt.c \
+ 	vswitchd/ovs-brcompatd.c
 -lib/coverage-counters.c: $(COVERAGE_SOURCES) lib/coverage-scan.pl
 -	(cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_SOURCES)) > $@.tmp
 +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