[vlc-commits] contrib: qtquickcontrols2: simplify the make calls

Steve Lhomme git at videolan.org
Fri Mar 20 09:24:11 CET 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar 19 16:57:51 2020 +0100| [d353d6d59f31eea396d9329aff5dd4d60fc0662c] | committer: Steve Lhomme

contrib: qtquickcontrols2: simplify the make calls

install_subtargets is equivalent to all three calls

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

 contrib/src/qtquickcontrols2/rules.mak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index b50bba7822..fa0999e530 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -33,8 +33,7 @@ QUICK_CONTROL_CONFIG := \
 .qtquickcontrols2: qtquickcontrols2
 	cd $< && $(PREFIX)/bin/qmake -- $(QUICK_CONTROL_CONFIG)
 	# Make && Install libraries
-	cd $< && $(MAKE)
-	cd $< && $(MAKE) -C src sub-quickcontrols2-install_subtargets sub-imports-install_subtargets
+	cd $< && $(MAKE) install_subtargets
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickControls2 qml/QtQuick/Controls.2 qtquickcontrols2plugin
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickControls2 qml/QtQuick/Templates.2 qtquicktemplates2plugin
 	touch $@



More information about the vlc-commits mailing list