From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Tue, 26 Nov 2013 15:56:56 +0000 (+0100)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.0.90-1~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0a407cd6f2129793940bfbd42dc39fe97e93e14b;hp=-c;p=sliver-openvswitch.git

Merge branch 'mainstream'
---

0a407cd6f2129793940bfbd42dc39fe97e93e14b
diff --combined Makefile.am
index 135e58f9a,3c6572c77..adb901bfa
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,7 -118,6 +118,7 @@@ ro_shell = printf '\043 Generated autom
  
  SUFFIXES += .in
  .in:
 +	@mkdir -p $$(dirname $@)
  	$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
  	    sed \
  		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@@ -160,7 -159,7 +160,7 @@@ dist-hook-git: distfile
  	  (cd datapath && $(MAKE) distfiles);				    \
  	  (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |	    \
  	    sort -u > all-distfiles;					    \
 -	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |	    \
 +	  (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |	    \
  	    sort -u > all-gitfiles;					    \
  	  comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
  	  if test -s missing-distfiles; then				    \
@@@ -195,6 -194,19 +195,19 @@@ config-h-check
  	    exit 1; \
  	fi
  .PHONY: config-h-check
+ 
+ # Check for printf() type modifiers that MSVC doesn't support.
+ ALL_LOCAL += printf-check
+ printf-check:
+ 	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
+ 	   git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not -e 'ovs_scan' `git ls-files $(srcdir) | grep '\.[ch]$$'`; \
+ 	then \
+ 	    echo "See above for list of violations of the rule that"; \
+ 	    echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \
+ 	    echo "forbidden.  See CodingStyle for replacements."; \
+ 	    exit 1; \
+ 	fi
+ .PHONY: printf-check
  
  # Check that certain data structures are always declared "static".
  ALL_LOCAL += static-check
@@@ -284,6 -296,5 +297,6 @@@ include rhel/automake.m
  include xenserver/automake.mk
  include python/automake.mk
  include python/compat/automake.mk
 +include planetlab/automake.mk
  include tutorial/automake.mk
  include vtep/automake.mk