[vlc-commits] contrib: add helper to invoke CMake

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 30 15:54:31 2011 +0300| [438669dd39f2f7fb6b2317b15f211bb4b7ee8338] | committer: Rémi Denis-Courmont

contrib: add helper to invoke CMake

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

 contrib/src/main.mak         |    3 +++
 contrib/src/mpcdec/rules.mak |    6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 587c9f3..baddcc2 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -181,6 +181,9 @@ UNPACK_DIR = $(basename $(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -p1) <
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
 
+CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
+		-DCMAKE_INSTALL_PREFIX=$(PREFIX)
+
 #
 # Per-package build rules
 #
diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index 4ccd62c..afe01bf 100644
--- a/contrib/src/mpcdec/rules.mak
+++ b/contrib/src/mpcdec/rules.mak
@@ -38,10 +38,8 @@ endif
 	touch $@
 
 .mpcdec: musepack toolchain.cmake
-	cd $< && cmake . \
-		-DCMAKE_TOOLCHAIN_FILE=../toolchain.cmake \
-		-DCMAKE_INSTALL_PREFIX="$(PREFIX)"
-	cd $< && make
+	cd $< && $(CMAKE) .
+	cd $< && $(MAKE)
 	mkdir -p -- "$(PREFIX)/lib"
 ifdef HAVE_WIN32
 	cd $< && cp libmpcdec/libmpcdec_static.a "$(PREFIX)/lib/libmpcdec.a"