Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7183326..71a0652 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010 Nicira Networks, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Nicira Networks, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -10,10 +10,9 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
-AM_CPPFLAGS += $(NCURSES_CFLAGS)
-AM_CPPFLAGS += $(PCRE_CFLAGS)
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
+AM_CPPFLAGS += -I $(top_builddir)/lib
 
 AM_CFLAGS = -Wstrict-prototypes
 AM_CFLAGS += $(WARNING_FLAGS)
@@ -28,9 +27,11 @@ endif
 ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
+CLEAN_LOCAL =
 DISTCLEANFILES =
 EXTRA_DIST = \
        CodingStyle \
+       DESIGN \
        INSTALL.KVM \
        INSTALL.Linux \
        INSTALL.OpenFlow \
@@ -61,6 +62,7 @@ noinst_PROGRAMS =
 noinst_SCRIPTS =
 OVSIDL_BUILT =
 SUFFIXES =
+check_DATA =
 
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is
@@ -89,7 +91,7 @@ SUFFIXES += .in
                 -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
                 -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),g' \
             > $@.tmp
-       @if head -n 1 $@.tmp | grep -q '#!'; then \
+       @if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
            echo chmod +x $@.tmp; \
            chmod +x $@.tmp; \
        fi
@@ -97,30 +99,47 @@ SUFFIXES += .in
 
 # If we're checked out from a Git repository, make sure that every
 # file that is in Git is distributed.
-dist-hook-git:
-       if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then    \
-         rc=0;                                                               \
-         for d in `cd $(srcdir) && git ls-files`; do                         \
-           if test ! -e $(distdir)/$$d; then                                 \
-             case $$d in # (                                                 \
-               .gitignore|*/.gitignore) ;; # (                               \
-               *)                                                            \
-                  if test $$rc = 0; then                                     \
-                    echo "The distribution is missing the following files:"; \
-                    rc=1;                                                    \
-                  fi;                                                        \
-                  echo "$$d";                                                \
-                  ;;                                                         \
-             esac;                                                           \
-           fi                                                                \
-         done;                                                               \
-         exit $$rc;                                                          \
+ALL_LOCAL += dist-hook-git
+dist-hook-git: distfiles
+       @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
+         (cd datapath && $(MAKE) distfiles);                               \
+         (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |        \
+           sort -u > all-distfiles;                                        \
+         (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |        \
+           sort -u > all-gitfiles;                                         \
+         comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;        \
+         if test -s missing-distfiles; then                                \
+           echo "The distribution is missing the following files:";        \
+           cat missing-distfiles;                                          \
+           exit 1;                                                         \
+         fi;                                                               \
        fi
-DIST_HOOKS += dist-hook-git
+CLEANFILES += all-distfiles all-gitfiles missing-distfiles
+# The following is based on commands for the Automake "distdir" target.
+distfiles: Makefile
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+       for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@
+CLEANFILES += distfiles
+
+# Check that "struct vlog_ratelimit" is always declared "static".
+ALL_LOCAL += rate-limit-check
+rate-limit-check:
+       @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
+           git --no-pager grep -n -E '^[       ]+struct vlog_rate_limit.*=' $(srcdir); \
+         then \
+           echo "See above for list of violations of the rule that "; \
+           echo "'struct vlog_rate_limit' must always be 'static'"; \
+           exit 1; \
+        fi
 
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)
-.PHONY: $(DIST_HOOKS)
+clean-local: $(CLEAN_LOCAL)
+.PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL)
 
 include lib/automake.mk
 include ofproto/automake.mk
@@ -132,5 +151,4 @@ include debian/automake.mk
 include vswitchd/automake.mk
 include ovsdb/automake.mk
 include xenserver/automake.mk
-include extras/ezio/automake.mk
-
+include python/ovs/automake.mk