From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 26 Sep 2009 08:34:29 +0000 (+0300)
Subject: revision: work around JVLC tag pollution
X-Git-Tag: 1.1.0-ff~3201
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e378e077a16312fad95f37cb527efb83eb3add72;p=vlc

revision: work around JVLC tag pollution

Still plain git-describe is not fixed/fixable, which is hugely annoying
(I use it a lot).
---

diff --git a/src/Makefile.am b/src/Makefile.am
index d49d292f9f..a508b86287 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -511,14 +511,14 @@ revision.c: revision.txt
 	echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
 		> revision.c
 
-revision.txt:
+revision.txt: Makefile.am
 	$(MAKE) stamp-revision
 	touch revision.txt
 
 stamp-revision:
 	rm -f -- revision.tmp
 	(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
-		--always || echo exported) > revision.tmp
+		--match '?.*.*' --always || echo exported) > revision.tmp
 	if diff revision.tmp revision.txt >/dev/null; then \
 		rm -f -- revision.tmp; \
 	else \