X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=932f495f0a0c64e05936df710c134726ac33c5bd;hb=6abf382a7900dbe982bb838c10db8b8c4cb20c45;hp=6615fd66e1d70111224e860080292b11343047eb;hpb=8f3485515becfc2dea7b788e15a448b36cee58b0;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 6615fd66e..932f495f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ EXTRA_DIST = \
 	CodingStyle \
 	DESIGN \
 	FAQ \
+	INSTALL \
 	INSTALL.KVM \
 	INSTALL.Libvirt \
-	INSTALL.Linux \
 	INSTALL.RHEL \
 	INSTALL.SSL \
 	INSTALL.XenServer \
@@ -108,6 +108,7 @@ SUFFIXES += .in
 	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+                -e 's,[@]DBDIR[@],$(DBDIR),g' \
                 -e 's,[@]PERL[@],$(PERL),g' \
                 -e 's,[@]PYTHON[@],$(PYTHON),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
@@ -133,13 +134,18 @@ CLEAN_LOCAL += clean-pycov
 
 # If we're checked out from a Git repository, make sure that every
 # file that is in Git is distributed.
+#
+# We only enable this check when GNU make is in use because the
+# Makefile in datapath/linux, needed to get the list of files to
+# distribute, requires GNU make extensions.
+if GNU_MAKE
 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$$' |	    \
+	  (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |	    \
 	    sort -u > all-gitfiles;					    \
 	  comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
 	  if test -s missing-distfiles; then				    \
@@ -148,7 +154,6 @@ dist-hook-git: distfiles
 	    exit 1;							    \
 	  fi;								    \
 	fi
-.PHONY: dist-hook-git
 CLEANFILES += all-distfiles all-gitfiles missing-distfiles
 # The following is based on commands for the Automake "distdir" target.
 distfiles: Makefile
@@ -159,6 +164,8 @@ distfiles: Makefile
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@
 CLEANFILES += distfiles
+endif
+.PHONY: dist-hook-git
 
 # Check that "struct vlog_ratelimit" is always declared "static".
 ALL_LOCAL += rate-limit-check
@@ -216,3 +223,4 @@ include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
+include planetlab/automake.mk