contrib: qt*: refactor make targets for clarity

Prepare the next patch by re-indenting the $(MAKE) target one by line.
The next patches will add the definition of new variables that will be
enforced from the command line.

contrib/src/qt/rules.mak

@@ -115,11 +115,25 @@ QT_ENV_VARS := $(HOSTVARS) DXSDK_DIR=$(PREFIX)/bin
 	+cd $< && $(QT_ENV_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX) -hostprefix $(PREFIX)/lib/qt5
 	# Make && Install libraries
 	cd $< && $(QT_ENV_VARS) $(MAKE)
-	cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets sub-network-install_subtargets
+	cd $< && $(MAKE) -C src \
+		sub-corelib-install_subtargets \
+		sub-gui-install_subtargets \
+		sub-widgets-install_subtargets \
+		sub-platformsupport-install_subtargets \
+		sub-zlib-install_subtargets \
+		sub-bootstrap-install_subtargets \
+		sub-network-install_subtargets
 	# Install tools
-	cd $< && $(MAKE) -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets sub-qlalr-install_subtargets
+	cd $< && $(MAKE) -C src \
+		sub-moc-install_subtargets \
+		sub-rcc-install_subtargets \
+		sub-uic-install_subtargets \
+		sub-qlalr-install_subtargets
 	# Install plugins
-	cd $< && $(MAKE) -C src -C plugins sub-imageformats-install_subtargets sub-platforms-install_subtargets sub-styles-install_subtargets
+	cd $< && $(MAKE) -C src -C plugins \
+		sub-imageformats-install_subtargets \
+		sub-platforms-install_subtargets \
+		sub-styles-install_subtargets
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Gui plugins/imageformats qjpeg
 ifdef HAVE_WIN32
 	# Add the private include to our project (similar to using "gui-private" in a qmake project) as well as ANGLE headers

contrib/src/qtdeclarative/rules.mak

@@ -35,14 +35,17 @@ QT_DECLARATIVE_CONFIG := \
 	cd $</src && $(PREFIX)/lib/qt5/bin/qmake -o Makefile src.pro
 	# Build & install only what we require
 	# Invoke the build rules one at a time as some rule dependencies seem to be broken
-	cd $< && $(MAKE) -C src sub-quick-make_first-ordered \
+	cd $< && $(MAKE) -C src \
+		sub-quick-make_first-ordered \
 		sub-qmlmodels-make_first-ordered \
 		sub-qmldevtools-make_first-ordered \
 		sub-qmlworkerscript-make_first-ordered
 	# We don't use particles, but the import target (which generates the qtquick2plugin.a) require
 	# the particle module to be built
-	cd $< && $(MAKE) -C src sub-particles-make_first-ordered
-	cd $< && $(MAKE) -C src sub-quick-install_subtargets \
+	cd $< && $(MAKE) -C src \
+		sub-particles-make_first-ordered
+	cd $< && $(MAKE) -C src \
+		sub-quick-install_subtargets \
 		sub-qml-install_subtargets \
 		sub-quickwidgets-install_subtargets \
 		sub-imports-install_subtargets \
@@ -50,7 +53,8 @@ QT_DECLARATIVE_CONFIG := \
 		sub-qmlworkerscript-install_subtargets \
 		sub-quickshapes-install_subtargets
 	cd $</tools && $(PREFIX)/lib/qt5/bin/qmake -o Makefile tools.pro
-	cd $< && $(MAKE) -C tools sub-qmlcachegen-install_subtargets
+	cd $< && $(MAKE) -C tools \
+		sub-qmlcachegen-install_subtargets
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick.2 qtquick2plugin
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick/Layouts qquicklayoutsplugin
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick/Window.2 windowplugin