Merge branch 'mainstream'

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0b59280..689faff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,6 +129,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' \
@@ -167,10 +168,10 @@ 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) |        \
-           LC_ALL=C sort -u > all-distfiles;                               \
-         (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |        \
-           LC_ALL=C sort -u > all-gitfiles;                                \
-         LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
+           LC_ALL=C sort -u > all-distfiles;                                       \
+         (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |     \
+           LC_ALL=C sort -u > all-gitfiles;                                        \
+         LC_ALL=C 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;                                          \
@@ -308,5 +309,6 @@ include rhel/automake.mk
 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