[vlc-commits] contrib: factor default integrity check rule

Rémi Denis-Courmont git at videolan.org
Tue Jun 28 18:45:33 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 28 16:11:35 2011 +0300| [bd3ef966b8efe9fa6b144b9303a67f28aa9c9e06] | committer: Rémi Denis-Courmont

contrib: factor default integrity check rule

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bd3ef966b8efe9fa6b144b9303a67f28aa9c9e06
---

 contrib/src/a52/rules.mak      |    2 --
 contrib/src/directx/rules.mak  |    2 --
 contrib/src/dshow/rules.mak    |    2 --
 contrib/src/ebml/rules.mak     |    2 --
 contrib/src/flac/rules.mak     |    2 --
 contrib/src/live555/rules.mak  |    2 --
 contrib/src/lua/rules.mak      |    2 --
 contrib/src/main.mak           |    7 +++++++
 contrib/src/matroska/rules.mak |    2 --
 contrib/src/ogg/rules.mak      |    2 --
 contrib/src/speex/rules.mak    |    2 --
 contrib/src/theora/rules.mak   |    2 --
 contrib/src/vorbis/rules.mak   |    2 --
 13 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index 660194f..9a2843a 100644
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -9,8 +9,6 @@ $(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz:
 	$(DOWNLOAD) $(A52DEC_URL)
 
 .sum-a52: a52dec-$(A52DEC_VERSION).tar.gz
-	$(CHECK_SHA512)
-	touch $@
 
 a52dec: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
 	$(UNPACK_GZ)
diff --git a/contrib/src/directx/rules.mak b/contrib/src/directx/rules.mak
index 7dbde55..f823676 100644
--- a/contrib/src/directx/rules.mak
+++ b/contrib/src/directx/rules.mak
@@ -10,8 +10,6 @@ $(TARBALLS)/directx-oss.tar.bz2:
 	$(DOWNLOAD) $(DX_HEADERS_URL)
 
 .sum-directx: directx-oss.tar.bz2
-	$(CHECK_SHA512)
-	touch $@
 
 .directx: directx-oss.tar.bz2 .sum-directx
 	mkdir -p -- "$(PREFIX)/include"
diff --git a/contrib/src/dshow/rules.mak b/contrib/src/dshow/rules.mak
index dcb7f4e..1d2ad95 100644
--- a/contrib/src/dshow/rules.mak
+++ b/contrib/src/dshow/rules.mak
@@ -22,8 +22,6 @@ $(TARBALLS)/d2d_headers.tar.gz:
 DSHOW_SOURCES := dshow-headers-oss.tar.bz2 dxva2api.h d2d_headers.tar.gz
 
 .sum-dshow: $(DSHOW_SOURCES)
-	$(CHECK_SHA512)
-	touch $@
 
 .dshow: $(DSHOW_SOURCES) .sum-dshow
 	mkdir -p -- "$(PREFIX)/include"
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index ee8d55b..2bde089 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -8,8 +8,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
 	$(DOWNLOAD) $(EBML_URL)
 
 .sum-ebml: libebml-$(EBML_VERSION).tar.bz2
-	$(CHECK_SHA512)
-	touch $@
 
 libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
 	$(UNPACK_BZ2)
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index 5466a25..520228e 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -9,8 +9,6 @@ $(TARBALLS)/flac-$(FLAC_VERSION).tar.gz:
 	$(DOWNLOAD) $(FLAC_URL)
 
 .sum-flac: flac-$(FLAC_VERSION).tar.gz
-	$(CHECK_SHA512)
-	touch $@
 
 flac: flac-$(FLAC_VERSION).tar.gz .sum-flac
 	$(UNPACK_GZ)
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 18e8dae..64ae134 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -8,8 +8,6 @@ $(TARBALLS)/live555-latest.tar.gz:
 	$(DOWNLOAD) $(LIVEDOTCOM_URL)
 
 .sum-live555: live555-latest.tar.gz
-	$(CHECK_SHA512)
-	touch $@
 
 live555: live555-latest.tar.gz .sum-live555
 	$(UNPACK_GZ)
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 77b0d83..f28f035 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -25,8 +25,6 @@ $(TARBALLS)/lua-$(LUA_VERSION).tar.gz:
 	$(DOWNLOAD) $(LUA_URL)
 
 .sum-lua: lua-$(LUA_VERSION).tar.gz
-	$(CHECK_SHA512)
-	touch $@
 
 lua: lua-$(LUA_VERSION).tar.gz .sum-lua
 	$(UNPACK_GZ)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6b8f4d9..d2e9b32 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -222,4 +222,11 @@ endif
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $@
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@
 
+#.SECONDEXPANSION:
+
+# Default pattern rules
+.sum-%: $(SRC)/%/SHA512SUMS
+	$(CHECK_SHA512)
+	touch $@
+
 .DELETE_ON_ERROR:
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index ca0a97e..dc876bc 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -10,8 +10,6 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
 	$(DOWNLOAD) $(MATROSKA_URL)
 
 .sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.bz2
-	$(CHECK_SHA512)
-	touch $@
 
 libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
 	$(UNPACK_BZ2)
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index c96e3b0..ef4aa3e 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -12,8 +12,6 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
 	$(DOWNLOAD) $(OGG_URL)
 
 .sum-ogg: libogg-$(OGG_VERSION).tar.xz
-	$(CHECK_SHA512)
-	touch $@
 
 libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 	$(UNPACK_XZ)
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index f8fd438..b8f241d 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -9,8 +9,6 @@ $(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
 	$(DOWNLOAD) $(SPEEX_URL)
 
 .sum-speex: speex-$(SPEEX_VERSION).tar.gz
-	$(CHECK_SHA512)
-	touch $@
 
 speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
 	$(UNPACK_GZ)
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index 4888e7d..0dff8ff 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -10,8 +10,6 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
 	$(DOWNLOAD) $(THEORA_URL)
 
 .sum-theora: libtheora-$(THEORA_VERSION).tar.xz
-	$(CHECK_SHA512)
-	touch $@
 
 libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
 	$(UNPACK_XZ)
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 76ded44..b1be2f3 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -15,8 +15,6 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 	$(DOWNLOAD) $(VORBIS_URL)
 
 .sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz
-	$(CHECK_SHA512)
-	touch $@
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 	$(UNPACK_XZ)



More information about the vlc-commits mailing list