[vlc-commits] contrib: fixed pkg-static and remove direct invocations

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Mon May 20 19:34:42 2019 +0300| [0172668ae7d7f319fd74bb149980225329b0d30a] | committer: Steve Lhomme

contrib: fixed pkg-static and remove direct invocations

(cherry picked from commit 58a0319e7283b5e1d8c4918593ce6e01484f6746) (rebased)

rebased:
- the master branch removed pthreadGC2 and the related patches before this patch

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/aom/rules.mak      | 2 +-
 contrib/src/libdsm/rules.mak   | 2 +-
 contrib/src/speex/rules.mak    | 2 +-
 contrib/src/speexdsp/rules.mak | 2 +-
 contrib/src/vpx/rules.mak      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index ed6e4b8333..06703653eb 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -95,6 +95,6 @@ endif
 	cd $< && mkdir -p aom_build
 	cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) CFLAGS="$(AOM_CFLAGS)" CXXFLAGS="$(AOM_CXXFLAGS)" $(CMAKE) ../ $(AOM_CONF)
 	cd $< && $(MAKE) -C aom_build
-	cd $</aom_build && $(SRC)/pkg-static.sh aom.pc
+	$(call pkg_static,"aom_build/aom.pc")
 	cd $</aom_build && $(MAKE) install
 	touch $@
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 4406d7ff3d..87c70e2669 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -32,6 +32,6 @@ endif
 	$(RECONF)
 	cd $< && $(HOSTVARS_PIC) ./configure --disable-programs $(LIBDSM_CONF)
 	cd $< && $(MAKE)
-	cd $< && $(SRC)/pkg-static.sh libdsm.pc
+	$(call pkg_static,"libdsm.pc")
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index ebe1ed251d..8f4cabef68 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -31,6 +31,6 @@ endif
 .speex: speex
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
 	cd $< && $(MAKE)
-	cd $< && $(SRC)/pkg-static.sh speex.pc
+	$(call pkg_static,"speex.pc")
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index eceb8731e4..7733d8a027 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -36,6 +36,6 @@ endif
 	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
 	cd $< && $(MAKE)
-	cd $< && $(SRC)/pkg-static.sh speexdsp.pc
+	$(call pkg_static,"speexdsp.pc")
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 0ea58a5862..5610b1a1e7 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -178,6 +178,6 @@ endif
 	cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) ./configure --target=$(VPX_TARGET) \
 		$(VPX_CONF) --prefix=$(PREFIX)
 	cd $< && $(MAKE)
-	cd $< && $(SRC)/pkg-static.sh vpx.pc
+	$(call pkg_static,"vpx.pc")
 	cd $< && $(MAKE) install
 	touch $@