X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=382f420e571f1e67de17a08af8d51d741af976e8;hb=7efa3dccd1968535ae32caf59746aa11ce7532f2;hp=903938921587c9af38f8d61c8acaed0f3d636865;hpb=8605a29b26ceb7dd6ae001b70ffcf158aab406ee;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 903938921..382f420e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,7 @@ DISTCLEANFILES =
 PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
 	BUILD.Windows \
+	CONTRIBUTING \
 	CodingStyle \
 	DESIGN \
 	FAQ \
@@ -78,7 +79,6 @@ EXTRA_DIST = \
 	PORTING \
 	README-lisp \
 	REPORTING-BUGS \
-	SubmittingPatches \
 	WHY-OVS \
 	boot.sh \
 	build-aux/cccl \
@@ -128,6 +128,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' \
@@ -166,10 +167,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;					    \
@@ -307,5 +308,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