summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2016-07-30 19:14:38 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2016-07-30 19:38:45 (GMT)
commit17e40d3884dc4b9db5b521c7e017a3fa12366370 (patch)
treefd65d0daed60fa8583bbbb9f37f9cec34a08fdd8 /plugins
parent208f5cc8508dd70d3f40fcba255e12cf8f1f9bf3 (diff)
downloadmxe-17e40d3884dc4b9db5b521c7e017a3fa12366370.zip
mxe-17e40d3884dc4b9db5b521c7e017a3fa12366370.tar.gz
mxe-17e40d3884dc4b9db5b521c7e017a3fa12366370.tar.bz2
use $(TEST_FILE) instead of $(2).c and other
The following script was applied: set -xue find src/ plugins/ -name '*.mk' -type f > mks # special cases for test file: # ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated sed 's@$(2).c@$(PWD)/src/$(PKG)-test.c@g' -i \ src/{boost,freeimage,hdf5,lapack,sdl,sdl_image,sdl_sound}.mk sed 's@$(2).f@$(PWD)/src/$(PKG)-test.f@g' -i src/lapack.mk sed 's@$(PWD)/$(2).pro@$(PWD)/src/$(PKG)-test.pro@g' -i \ src/qt.mk plugins/examples/custom-qt-min/overrides.mk sed 's@$(2)-CMakeLists.txt@$(PWD)/src/$(PKG)-test-CMakeLists.txt@g' \ -i src/{sdl_image,sdl_sound}.mk # check for base in $(ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated); do ! grep -q '$(2)' "${base}.mk" done # other $(2) sed 's@$(2).cpp@$(TEST_FILE)@g' -i $(cat mks) sed 's@$(2).cxx@$(TEST_FILE)@g' -i $(cat mks) sed 's@$(2).c@$(TEST_FILE)@g' -i $(cat mks) sed 's@$(2).ml@$(TEST_FILE)@g' -i $(cat mks) sed 's@$(2).f@$(TEST_FILE)@g' -i $(cat mks) # check ! grep '$(2)' $(cat mks) See https://github.com/mxe/mxe/issues/1452
Diffstat (limited to 'plugins')
-rw-r--r--plugins/examples/custom-qt-min/overrides.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/examples/custom-qt-min/overrides.mk b/plugins/examples/custom-qt-min/overrides.mk
index f5e5e3a..9e47254 100644
--- a/plugins/examples/custom-qt-min/overrides.mk
+++ b/plugins/examples/custom-qt-min/overrides.mk
@@ -78,7 +78,7 @@ define qt_BUILD
ln -sf '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt4
mkdir '$(1)/test-qt'
- cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PWD)/$(2).pro'
+ cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PWD)/src/$(PKG)-test.pro'
$(MAKE) -C '$(1)/test-qt' -j '$(JOBS)'
$(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(PREFIX)/$(TARGET)/bin/'