Catalli's threaded switch

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f8dfd16..da4c1b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,6 @@ 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
 
@@ -25,19 +23,30 @@ else
 AM_LDFLAGS = -export-dynamic
 endif
 
+ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
-EXTRA_DIST = INSTALL.bridge \
+EXTRA_DIST = \
+       CodingStyle \
+       INSTALL.KVM \
        INSTALL.Linux \
-       INSTALL.userspace \
        INSTALL.OpenFlow \
        INSTALL.SSL \
        INSTALL.XenServer \
-       README-gcov
+       INSTALL.bridge \
+       INSTALL.userspace \
+       NOTICE \
+       PORTING \
+       README-gcov \
+       REPORTING-BUGS \
+       SubmittingPatches \
+       WHY-OVS \
+       boot.sh
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
+DIST_HOOKS =
 dist_man_MANS =
 dist_pkgdata_DATA =
 dist_pkgdata_SCRIPTS =
@@ -51,7 +60,14 @@ noinst_SCRIPTS =
 OVSIDL_BUILT =
 SUFFIXES =
 
-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,6 +85,7 @@ 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 \
            echo chmod +x $@.tmp; \
@@ -76,6 +93,33 @@ SUFFIXES += .in
        fi
        mv $@.tmp $@
 
+# 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;                                                          \
+       fi
+DIST_HOOKS += dist-hook-git
+
+dist-hook: $(DIST_HOOKS)
+all-local: $(ALL_LOCAL)
+.PHONY: $(DIST_HOOKS)
+
 include lib/automake.mk
 include ofproto/automake.mk
 include utilities/automake.mk
@@ -86,4 +130,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