X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=71a0652c976e0ae9a22cc699c390d17a103685e1;hb=refs%2Fheads%2Fbranch-1.1;hp=bb8245efd804a3453023619f9d2f20e1d248e47b;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index bb8245efd..71a0652c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 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)
@@ -25,21 +24,34 @@ else
 AM_LDFLAGS = -export-dynamic
 endif
 
+ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
+CLEAN_LOCAL =
 DISTCLEANFILES =
-EXTRA_DIST = INSTALL.bridge \
+EXTRA_DIST = \
+	CodingStyle \
+	DESIGN \
+	INSTALL.KVM \
 	INSTALL.Linux \
-	INSTALL.userspace \
 	INSTALL.OpenFlow \
 	INSTALL.SSL \
 	INSTALL.XenServer \
+	INSTALL.bridge \
+	INSTALL.userspace \
+	NOTICE \
+	PORTING \
 	README-gcov \
-	++WARNING++
+	REPORTING-BUGS \
+	SubmittingPatches \
+	WHY-OVS \
+	boot.sh
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
+DIST_HOOKS =
 dist_man_MANS =
+dist_pkgdata_DATA =
 dist_pkgdata_SCRIPTS =
 dist_sbin_SCRIPTS =
 man_MANS =
@@ -50,8 +62,16 @@ noinst_PROGRAMS =
 noinst_SCRIPTS =
 OVSIDL_BUILT =
 SUFFIXES =
+check_DATA =
 
-EXTRA_DIST += soexpand.pl
+# This ensures that files added to EXTRA_DIST are always distributed,
+# even if they are inside an Automake if...endif conditional block that is
+# disabled by some particular "configure" run.  For more information, see:
+# http://article.gmane.org/gmane.comp.sysutils.automake.general/10891
+noinst_HEADERS += $(EXTRA_DIST)
+
+EXTRA_DIST += \
+	soexpand.pl
 
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
 
@@ -69,13 +89,58 @@ SUFFIXES += .in
                 -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
                 -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
                 -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
 	mv $@.tmp $@
 
+# If we're checked out from a Git repository, make sure that every
+# file that is in Git is distributed.
+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
+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)
+clean-local: $(CLEAN_LOCAL)
+.PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL)
+
 include lib/automake.mk
 include ofproto/automake.mk
 include utilities/automake.mk
@@ -86,4 +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