Commit 5d1720e5 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Steve Lhomme

contribs: Qt: Always use the prefix-based qmake

parent 1aa83e2c
......@@ -31,13 +31,8 @@ qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
.qtdeclarative: qtdeclarative
# Generate Makefile & src/Makefile
ifdef HAVE_CROSS_COMPILE
cd $< && $(PREFIX)/bin/qmake
cd $</src && $(PREFIX)/bin/qmake -o Makefile src.pro
else
cd $< && ../qt/bin/qmake
cd $</src && ../../qt/bin/qmake -o Makefile src.pro
endif
# 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
......
......@@ -27,11 +27,7 @@ qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz .sum-qtgraphicalef
$(MOVE)
.qtgraphicaleffects: qtgraphicaleffects
ifdef HAVE_CROSS_COMPILE
cd $< && $(PREFIX)/bin/qmake
else
cd $< && ../qt/bin/qmake
endif
# Make && Install libraries
cd $< && $(MAKE)
cd $< && $(MAKE) -C src sub-effects-install_subtargets
......
......@@ -15,11 +15,7 @@ qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols
$(MOVE)
.qtquickcontrols: qtquickcontrols
ifdef HAVE_CROSS_COMPILE
cd $< && $(PREFIX)/bin/qmake
else
cd $< && ../qt/bin/qmake
endif
# Make && Install libraries
cd $< && $(MAKE)
cd $< && $(MAKE) -C src sub-controls-install_subtargets
......
......@@ -27,16 +27,8 @@ qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
mv qtquickcontrols2-everywhere-src-$(QTQC2_VERSION) qtquickcontrols2-$(QTQC2_VERSION)
$(MOVE)
ifdef HAVE_CROSS_COMPILE
QMAKE=$(PREFIX)/bin/qmake
else
QMAKE=../qt/bin/qmake
endif
.qtquickcontrols2: qtquickcontrols2
cd $< && $(QMAKE)
cd $< && $(PREFIX)/bin/qmake
# Make && Install libraries
cd $< && $(MAKE)
cd $< && $(MAKE) -C src sub-quickcontrols2-install_subtargets sub-imports-install_subtargets
......
......@@ -25,11 +25,7 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
$(MOVE)
.qtsvg: qtsvg
ifdef HAVE_CROSS_COMPILE
cd $< && $(PREFIX)/bin/qmake
else
cd $< && ../qt/bin/qmake
endif
# Make && Install libraries
cd $< && $(MAKE)
cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment