vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jan 29 18:45:51 2014 +0200| [c17e507a2a2fff29b8ac806e7c25276930c13f92] | committer: Rémi Denis-Courmont
npapi: update the tree automatically and, if needed, rebuild > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c17e507a2a2fff29b8ac806e7c25276930c13f92 --- extras/package/npapi.am | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/extras/package/npapi.am b/extras/package/npapi.am index 5714c93..1812950 100644 --- a/extras/package/npapi.am +++ b/extras/package/npapi.am @@ -1,19 +1,33 @@ #! /usr/bin/make -f -build-npapi: stamp-npapi-build +build-npapi: fetch-npapi + $(MAKE) install-npapi -stamp-npapi-fetch: - rm -Rf npapi-vlc - git clone git://git.videolan.org/npapi-vlc.git npapi-vlc - touch $@ +fetch-npapi: + rm -f -- stamp-npapi.tmp + if test -d npapi-vlc; then \ + cd npapi-vlc && \ + git fetch origin && \ + git reset --hard origin/master; \ + else \ + git clone git://git.videolan.org/npapi-vlc.git npapi-vlc ; \ + fi + git --git-dir=npapi-vlc/.git describe --long --always > stamp-npapi.tmp + if diff stamp-npapi.tmp stamp-npapi >/dev/null 2>&1; then \ + rm -f -- stamp-npapi.tmp ; \ + else \ + mv -f -- stamp-npapi.tmp stamp-npapi ; \ + fi + +stamp-npapi: + $(MAKE) fetch-npapi -stamp-npapi-autogen: stamp-npapi-fetch -# extras/package/npapi.am +npapi-vlc/configure: stamp-npapi cd npapi-vlc && \ $(SHELL) ./autogen.sh touch $@ -stamp-npapi-configure: stamp-npapi-autogen +npapi-vlc/Makefile: npapi-vlc/configure cd npapi-vlc && \ $(SHELL) ./configure \ --prefix=/ \ @@ -26,8 +40,9 @@ stamp-npapi-configure: stamp-npapi-autogen PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../lib" touch $@ -stamp-npapi-build: stamp-npapi-configure - cd npapi-vlc && \ - $(MAKE) all && \ - $(MAKE) DESTDIR="$(abs_builddir)/npapi-vlc/installed" install - touch $@ +npapi-vlc/npapi/npvlc.la: npapi-vlc/Makefile + $(MAKE) -C npapi-vlc + +install-npapi: npapi-vlc/npapi/npvlc.la + $(MAKE) -C npapi-vlc \ + DESTDIR="$(abs_builddir)/npapi-vlc/installed" install _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
