X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=bd5e2fc10ce3a3d07185e732c6c7bbbba1d50f74;hb=ea7655d9f9d38a3af7250de8ba0b89115b5f4a5e;hp=b00b82ccb3b60ed0be0cfe9e18277b884b0778bb;hpb=fedbc4d62ec34af4fe1a48895b18c45e1c13e931;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index b00b82ccb..bd5e2fc10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,10 +50,10 @@ EXTRA_DIST = \
 	INSTALL.RHEL \
 	INSTALL.SSL \
 	INSTALL.XenServer \
-	INSTALL.bridge \
 	INSTALL.userspace \
 	IntegrationGuide \
 	NOTICE \
+	OPENFLOW-1.1+ \
 	PORTING \
 	README-gcov \
 	REPORTING-BUGS \
@@ -106,6 +106,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
+	@mkdir -p $$(dirname $@)
 	$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
 	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@ -147,7 +148,7 @@ dist-hook-git: distfiles
 	  (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				    \
@@ -174,7 +175,7 @@ ALL_LOCAL += config-h-check
 config-h-check:
 	@cd $(srcdir); \
 	if test -e .git && (git --version) >/dev/null 2>&1 && \
-	   git grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
+	   git --no-pager grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
                grep -vE '^datapath|^lib/sflow|^third-party'`; \
 	then \
 	    echo "See above for list of violations of the rule that"; \
@@ -195,6 +196,19 @@ rate-limit-check:
 	 fi
 .PHONY: rate-limit-check
 
+# Check that assert.h is not used outside a whitelist of files.
+ALL_LOCAL += check-assert-h-usage
+check-assert-h-usage:
+	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
+	    (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \
+	    $(EGREP) -v '^lib/(sflow_receiver|vlog|worker).c$$|^tests/'; \
+         then \
+	    echo "Files listed above unexpectedly #include <""assert.h"">."; \
+	    echo "Please use ovs_assert (from util.h) instead of assert."; \
+	    exit 1; \
+	 fi
+.PHONY: check-assert-h-usage
+
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
 manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
@@ -244,3 +258,4 @@ include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
+include planetlab/automake.mk