From 17e40d3884dc4b9db5b521c7e017a3fa12366370 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 30 Jul 2016 22:14:38 +0300
Subject: 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
---
 plugins/examples/custom-qt-min/overrides.mk | 2 +-
 src/armadillo.mk                            | 2 +-
 src/assimp.mk                               | 2 +-
 src/aubio.mk                                | 2 +-
 src/boost.mk                                | 2 +-
 src/bullet.mk                               | 2 +-
 src/cegui.mk                                | 2 +-
 src/cfitsio.mk                              | 2 +-
 src/chipmunk.mk                             | 2 +-
 src/coda.mk                                 | 2 +-
 src/coin.mk                                 | 2 +-
 src/cryptopp.mk                             | 2 +-
 src/curl.mk                                 | 2 +-
 src/eigen.mk                                | 2 +-
 src/file.mk                                 | 2 +-
 src/fltk.mk                                 | 2 +-
 src/freeglut.mk                             | 2 +-
 src/freeimage.mk                            | 4 ++--
 src/ftgl.mk                                 | 2 +-
 src/gd.mk                                   | 2 +-
 src/geos.mk                                 | 2 +-
 src/glew.mk                                 | 4 ++--
 src/glfw2.mk                                | 2 +-
 src/glfw3.mk                                | 2 +-
 src/glm.mk                                  | 2 +-
 src/gnutls.mk                               | 2 +-
 src/graphicsmagick.mk                       | 2 +-
 src/gsl.mk                                  | 2 +-
 src/gta.mk                                  | 2 +-
 src/gtk2.mk                                 | 2 +-
 src/gtk3.mk                                 | 2 +-
 src/gtkglext.mk                             | 2 +-
 src/gtkglextmm.mk                           | 2 +-
 src/gtkimageview.mk                         | 2 +-
 src/gtkmm2.mk                               | 2 +-
 src/gtkmm3.mk                               | 2 +-
 src/guile.mk                                | 2 +-
 src/hdf-eos2.mk                             | 2 +-
 src/hdf-eos5.mk                             | 2 +-
 src/hdf5.mk                                 | 2 +-
 src/hunspell.mk                             | 2 +-
 src/imagemagick.mk                          | 2 +-
 src/jpeg.mk                                 | 2 +-
 src/json-c.mk                               | 2 +-
 src/lapack.mk                               | 4 ++--
 src/lensfun.mk                              | 2 +-
 src/libaacs.mk                              | 2 +-
 src/libarchive.mk                           | 2 +-
 src/libass.mk                               | 2 +-
 src/libechonest.mk                          | 2 +-
 src/libffi.mk                               | 2 +-
 src/libftdi1.mk                             | 2 +-
 src/libgcrypt.mk                            | 2 +-
 src/libgsasl.mk                             | 2 +-
 src/libiberty.mk                            | 2 +-
 src/libical.mk                              | 2 +-
 src/libidn.mk                               | 2 +-
 src/libircclient.mk                         | 2 +-
 src/liblaxjson.mk                           | 2 +-
 src/libmicrohttpd.mk                        | 2 +-
 src/libmikmod.mk                            | 2 +-
 src/libmodplug.mk                           | 2 +-
 src/libmysqlclient.mk                       | 2 +-
 src/liboauth.mk                             | 2 +-
 src/libpng.mk                               | 2 +-
 src/librsvg.mk                              | 2 +-
 src/libsoup.mk                              | 2 +-
 src/libssh2.mk                              | 2 +-
 src/libusb1.mk                              | 2 +-
 src/libuv.mk                                | 2 +-
 src/libzip.mk                               | 2 +-
 src/log4cxx.mk                              | 2 +-
 src/lua.mk                                  | 2 +-
 src/luabind.mk                              | 2 +-
 src/muparserx.mk                            | 2 +-
 src/mxml.mk                                 | 2 +-
 src/ocaml-cairo.mk                          | 2 +-
 src/ocaml-camlimages.mk                     | 2 +-
 src/ocaml-core.mk                           | 4 ++--
 src/ocaml-findlib.mk                        | 2 +-
 src/ocaml-lablgtk2.mk                       | 2 +-
 src/openal.mk                               | 2 +-
 src/openexr.mk                              | 2 +-
 src/pfstools.mk                             | 2 +-
 src/physfs.mk                               | 2 +-
 src/plibc.mk                                | 2 +-
 src/poco.mk                                 | 2 +-
 src/poppler.mk                              | 2 +-
 src/portaudio.mk                            | 2 +-
 src/portmidi.mk                             | 2 +-
 src/protobuf.mk                             | 2 +-
 src/qdbm.mk                                 | 2 +-
 src/qjson.mk                                | 2 +-
 src/qscintilla2.mk                          | 2 +-
 src/qt.mk                                   | 2 +-
 src/qtsparkle_qt4.mk                        | 2 +-
 src/rucksack.mk                             | 2 +-
 src/sdl.mk                                  | 2 +-
 src/sdl2.mk                                 | 2 +-
 src/sdl2_gfx.mk                             | 2 +-
 src/sdl2_net.mk                             | 2 +-
 src/sdl_gfx.mk                              | 2 +-
 src/sdl_image.mk                            | 6 +++---
 src/sdl_mixer.mk                            | 2 +-
 src/sdl_net.mk                              | 2 +-
 src/sdl_rwhttp.mk                           | 2 +-
 src/sdl_sound.mk                            | 6 +++---
 src/sfml.mk                                 | 2 +-
 src/smpeg.mk                                | 2 +-
 src/sox.mk                                  | 2 +-
 src/subversion.mk                           | 2 +-
 src/vidstab.mk                              | 2 +-
 src/vigra.mk                                | 2 +-
 src/wxwidgets.mk                            | 2 +-
 src/xerces.mk                               | 2 +-
 src/xxhash.mk                               | 2 +-
 116 files changed, 124 insertions(+), 124 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/'
 
diff --git a/src/armadillo.mk b/src/armadillo.mk
index d5fd358..46fc4fb 100644
--- a/src/armadillo.mk
+++ b/src/armadillo.mk
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-armadillo.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-armadillo.exe' \
         -larmadillo -llapack -lblas -lgfortran -lquadmath
 endef
diff --git a/src/assimp.mk b/src/assimp.mk
index ba7ae5e..5a8f165 100644
--- a/src/assimp.mk
+++ b/src/assimp.mk
@@ -30,6 +30,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-assimp.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-assimp.exe' \
         `'$(TARGET)-pkg-config' assimp --cflags --libs`
 endef
diff --git a/src/aubio.mk b/src/aubio.mk
index 0a32734..e024cf5 100644
--- a/src/aubio.mk
+++ b/src/aubio.mk
@@ -40,6 +40,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc'                               \
         -W -Wall -Werror -ansi -pedantic          \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-aubio.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-aubio.exe' \
         `'$(TARGET)-pkg-config' aubio --cflags --libs`
 endef
diff --git a/src/boost.mk b/src/boost.mk
index d73379e..77bfb1b 100644
--- a/src/boost.mk
+++ b/src/boost.mk
@@ -67,7 +67,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \
+        '$(PWD)/src/$(PKG)-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \
         -DBOOST_THREAD_USE_LIB \
         -lboost_serialization-mt \
         -lboost_thread_win32-mt \
diff --git a/src/bullet.mk b/src/bullet.mk
index 2afe1c9..8906257 100644
--- a/src/bullet.mk
+++ b/src/bullet.mk
@@ -33,6 +33,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
 endef
diff --git a/src/cegui.mk b/src/cegui.mk
index a7e22ed..b7073aa 100644
--- a/src/cegui.mk
+++ b/src/cegui.mk
@@ -53,7 +53,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -ansi -pedantic \
-         '$(2).cpp' \
+         '$(TEST_FILE)' \
          `'$(TARGET)-pkg-config' --cflags --libs CEGUI-OPENGL glut freetype2 libpcre` \
          -lCEGUIFreeImageImageCodec -lCEGUIXercesParser -lCEGUIFalagardWRBase \
          `'$(TARGET)-pkg-config' --libs --cflags freeimage xerces-c` \
diff --git a/src/cfitsio.mk b/src/cfitsio.mk
index 4ba9e83..f2143cc 100644
--- a/src/cfitsio.mk
+++ b/src/cfitsio.mk
@@ -27,7 +27,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-cfitsio.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-cfitsio.exe' \
         `'$(TARGET)-pkg-config' cfitsio --cflags --libs`
 endef
 
diff --git a/src/chipmunk.mk b/src/chipmunk.mk
index ca04da9..a614970 100644
--- a/src/chipmunk.mk
+++ b/src/chipmunk.mk
@@ -34,6 +34,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic -std=c99 \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-chipmunk.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-chipmunk.exe' \
         -lchipmunk
 endef
diff --git a/src/coda.mk b/src/coda.mk
index ecba702..cac80e1 100644
--- a/src/coda.mk
+++ b/src/coda.mk
@@ -33,6 +33,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -std=c99 -W -Wall -Werror -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-coda.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-coda.exe' \
         -lcoda
 endef
diff --git a/src/coin.mk b/src/coin.mk
index 253bc5b..f1834cd 100644
--- a/src/coin.mk
+++ b/src/coin.mk
@@ -35,6 +35,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-coin.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-coin.exe' \
         `'$(TARGET)-pkg-config' Coin --cflags --libs`
 endef
diff --git a/src/cryptopp.mk b/src/cryptopp.mk
index 4b199d1..71ddb4f 100644
--- a/src/cryptopp.mk
+++ b/src/cryptopp.mk
@@ -49,6 +49,6 @@ define $(PKG)_BUILD
 
     $(TARGET)-g++ \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `$(TARGET)-pkg-config cryptopp --cflags --libs`
 endef
diff --git a/src/curl.mk b/src/curl.mk
index 2f86bbd..f9b6ea6 100644
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -30,6 +30,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-curl.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-curl.exe' \
         `'$(TARGET)-pkg-config' libcurl --cflags --libs`
 endef
diff --git a/src/eigen.mk b/src/eigen.mk
index 6fe642d..258e811 100644
--- a/src/eigen.mk
+++ b/src/eigen.mk
@@ -25,7 +25,7 @@ define $(PKG)_BUILD
         -Drun_res=1 -Drun_res__TRYRUN_OUTPUT=""
     $(MAKE) -C '$(1)'/build -j '$(JOBS)' install VERBOSE=1
 
-    '$(TARGET)-g++' -W -Wall '$(2).cpp' -o \
+    '$(TARGET)-g++' -W -Wall '$(TEST_FILE)' -o \
         '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' --cflags --libs eigen3`
 endef
diff --git a/src/file.mk b/src/file.mk
index bb9c981..2a42b97 100644
--- a/src/file.mk
+++ b/src/file.mk
@@ -39,6 +39,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-file.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-file.exe' \
         -lmagic -lgnurx -lshlwapi
 endef
diff --git a/src/fltk.mk b/src/fltk.mk
index 3887ffc..f33e4aa 100644
--- a/src/fltk.mk
+++ b/src/fltk.mk
@@ -30,6 +30,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -ansi \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-fltk.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-fltk.exe' \
         `$(TARGET)-fltk-config --cxxflags --ld$(if $(BUILD_STATIC),static)flags`
 endef
diff --git a/src/freeglut.mk b/src/freeglut.mk
index e7dc69b..729ffd4 100644
--- a/src/freeglut.mk
+++ b/src/freeglut.mk
@@ -29,6 +29,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \
         `'$(TARGET)-pkg-config' glut --cflags --libs`
 endef
diff --git a/src/freeimage.mk b/src/freeimage.mk
index d83f3b0..51b62e3 100644
--- a/src/freeimage.mk
+++ b/src/freeimage.mk
@@ -56,12 +56,12 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeimage.exe' \
+        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-freeimage.exe' \
         `'$(TARGET)-pkg-config' freeimage --cflags --libs`
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-freeimageplus.exe' \
+        '$(PWD)/src/$(PKG)-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-freeimageplus.exe' \
         `'$(TARGET)-pkg-config' freeimageplus --cflags --libs`
 endef
 
diff --git a/src/ftgl.mk b/src/ftgl.mk
index a48d81e..6b3b0e2 100644
--- a/src/ftgl.mk
+++ b/src/ftgl.mk
@@ -35,7 +35,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' freetype2 --cflags --libs` \
         `'$(TARGET)-pkg-config' ftgl --cflags --libs`
 endef
diff --git a/src/gd.mk b/src/gd.mk
index 7c27669..714592b 100644
--- a/src/gd.mk
+++ b/src/gd.mk
@@ -29,7 +29,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gd.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gd.exe' \
         `'$(PREFIX)/$(TARGET)/bin/gdlib-config' --cflags --libs`
 endef
 
diff --git a/src/geos.mk b/src/geos.mk
index 7f5ac16..86cbbfb 100644
--- a/src/geos.mk
+++ b/src/geos.mk
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-geos.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-geos.exe' \
         `'$(PREFIX)/bin/$(TARGET)-geos-config' --cflags --clibs`
 endef
diff --git a/src/glew.mk b/src/glew.mk
index 1a9ec5f..83e5bc8 100644
--- a/src/glew.mk
+++ b/src/glew.mk
@@ -60,11 +60,11 @@ define $(PKG)_BUILD
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         `'$(TARGET)-pkg-config' glew --cflags` \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glew.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glew.exe' \
         `'$(TARGET)-pkg-config' glew --libs`
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         `'$(TARGET)-pkg-config' glewmx --cflags` \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glewmx.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glewmx.exe' \
         `'$(TARGET)-pkg-config' glewmx --libs`
 endef
diff --git a/src/glfw2.mk b/src/glfw2.mk
index 4a51332..fcc591e 100644
--- a/src/glfw2.mk
+++ b/src/glfw2.mk
@@ -43,7 +43,7 @@ define $(PKG)_BUILD
     #Test
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glfw2.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glfw2.exe' \
         `'$(TARGET)-pkg-config' libglfw --cflags --libs`
 endef
 
diff --git a/src/glfw3.mk b/src/glfw3.mk
index 86c3a86..685865f 100644
--- a/src/glfw3.mk
+++ b/src/glfw3.mk
@@ -33,7 +33,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glfw3.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glfw3.exe' \
         `'$(TARGET)-pkg-config' glfw3 --cflags --libs`
 endef
 
diff --git a/src/glm.mk b/src/glm.mk
index eba83d1..508a635 100644
--- a/src/glm.mk
+++ b/src/glm.mk
@@ -23,6 +23,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-glm.exe'
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glm.exe'
 endef
 
diff --git a/src/gnutls.mk b/src/gnutls.mk
index 8f30687..dd11726 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -38,6 +38,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \
         `'$(TARGET)-pkg-config' gnutls --cflags --libs`
 endef
diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk
index 30c4c0e..ac0ce71 100644
--- a/src/graphicsmagick.mk
+++ b/src/graphicsmagick.mk
@@ -49,6 +49,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -std=gnu++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-graphicsmagick.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-graphicsmagick.exe' \
         `'$(TARGET)-pkg-config' GraphicsMagick++ --cflags --libs` -llzma
 endef
diff --git a/src/gsl.mk b/src/gsl.mk
index 5ee761c..e121c33 100644
--- a/src/gsl.mk
+++ b/src/gsl.mk
@@ -29,7 +29,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \
         -lgsl
 endef
 
diff --git a/src/gta.mk b/src/gta.mk
index d68abaf..7b74f8a 100644
--- a/src/gta.mk
+++ b/src/gta.mk
@@ -26,7 +26,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gta.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gta.exe' \
         `'$(TARGET)-pkg-config' gta --cflags --libs`
 endef
 
diff --git a/src/gtk2.mk b/src/gtk2.mk
index 275be1e..f855501 100644
--- a/src/gtk2.mk
+++ b/src/gtk2.mk
@@ -35,7 +35,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtk2.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtk2.exe' \
         `'$(TARGET)-pkg-config' gtk+-2.0 gmodule-2.0 --cflags --libs`
 endef
 
diff --git a/src/gtk3.mk b/src/gtk3.mk
index 7c33736..970cd46 100644
--- a/src/gtk3.mk
+++ b/src/gtk3.mk
@@ -34,7 +34,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtk3.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtk3.exe' \
         `'$(TARGET)-pkg-config' gtk+-3.0 --cflags --libs`
 endef
 
diff --git a/src/gtkglext.mk b/src/gtkglext.mk
index 83c4581..679b6cc 100644
--- a/src/gtkglext.mk
+++ b/src/gtkglext.mk
@@ -40,7 +40,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglext.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglext.exe' \
         `'$(TARGET)-pkg-config' gtkglext-1.0 --cflags --libs`
 endef
 
diff --git a/src/gtkglextmm.mk b/src/gtkglextmm.mk
index 5f7ea8b..e1a23e6 100644
--- a/src/gtkglextmm.mk
+++ b/src/gtkglextmm.mk
@@ -32,7 +32,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -std=c++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglextmm.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglextmm.exe' \
         `'$(TARGET)-pkg-config' gtkglextmm-1.2 --cflags --libs`
 endef
 
diff --git a/src/gtkimageview.mk b/src/gtkimageview.mk
index 9dbbd78..ae115b3 100644
--- a/src/gtkimageview.mk
+++ b/src/gtkimageview.mk
@@ -38,7 +38,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtkimageview.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkimageview.exe' \
         `'$(TARGET)-pkg-config' gtkimageview --cflags --libs`
 endef
 
diff --git a/src/gtkmm2.mk b/src/gtkmm2.mk
index abc4de3..8f42e23 100644
--- a/src/gtkmm2.mk
+++ b/src/gtkmm2.mk
@@ -31,7 +31,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -std=c++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm2.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm2.exe' \
         `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs`
 endef
 
diff --git a/src/gtkmm3.mk b/src/gtkmm3.mk
index 0d55651..00ebd4f 100644
--- a/src/gtkmm3.mk
+++ b/src/gtkmm3.mk
@@ -30,7 +30,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -std=c++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm3.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm3.exe' \
         `'$(TARGET)-pkg-config' gtkmm-3.0 --cflags --libs`
 endef
 
diff --git a/src/guile.mk b/src/guile.mk
index d604ac6..7de694a 100644
--- a/src/guile.mk
+++ b/src/guile.mk
@@ -37,7 +37,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-guile.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-guile.exe' \
         `'$(TARGET)-pkg-config' guile-$(call SHORT_PKG_VERSION,$(PKG)) --cflags --libs` \
         -DGUILE_MAJOR_MINOR=\"$(call SHORT_PKG_VERSION,$(PKG))\"
 endef
diff --git a/src/hdf-eos2.mk b/src/hdf-eos2.mk
index 75b9fd3..5131227 100644
--- a/src/hdf-eos2.mk
+++ b/src/hdf-eos2.mk
@@ -29,7 +29,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -std=c99 -W -Wall -Werror -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         -lhdfeos -lmfhdf -ldf -lz -ljpeg -lportablexdr -lws2_32
 endef
 
diff --git a/src/hdf-eos5.mk b/src/hdf-eos5.mk
index 626930f..a6a98cc 100644
--- a/src/hdf-eos5.mk
+++ b/src/hdf-eos5.mk
@@ -27,7 +27,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -std=c99 -W -Wall -Werror -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         -lhe5_hdfeos -lhdf5_hl -lhdf5 -lz
 endef
 
diff --git a/src/hdf5.mk b/src/hdf5.mk
index 56cd437..a918773 100644
--- a/src/hdf5.mk
+++ b/src/hdf5.mk
@@ -67,7 +67,7 @@ define $(PKG)_BUILD
     ## test hdf5
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hdf5.exe' \
+        '$(PWD)/src/$(PKG)-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hdf5.exe' \
         -lhdf5_hl -lhdf5 -lz
 
     # test cmake can find hdf5
diff --git a/src/hunspell.mk b/src/hunspell.mk
index 02804e0..8af1414 100644
--- a/src/hunspell.mk
+++ b/src/hunspell.mk
@@ -28,6 +28,6 @@ define $(PKG)_BUILD
     # Test
     '$(TARGET)-g++' \
         -W -Wall -Werror -std=c++0x -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \
         `'$(TARGET)-pkg-config' hunspell --cflags --libs`
 endef
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index 5564270..0a0f096 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -33,6 +33,6 @@ define $(PKG)_BUILD
 
     '$(1)'/libtool --mode=link --tag=CXX \
         '$(TARGET)-g++' -Wall -Wextra -std=gnu++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-imagemagick.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-imagemagick.exe' \
         `'$(TARGET)-pkg-config' ImageMagick++ --cflags --libs`
 endef
diff --git a/src/jpeg.mk b/src/jpeg.mk
index f47a43c..881a67c 100644
--- a/src/jpeg.mk
+++ b/src/jpeg.mk
@@ -31,6 +31,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-jpeg.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-jpeg.exe' \
         `'$(TARGET)-pkg-config' jpeg --libs`
 endef
diff --git a/src/json-c.mk b/src/json-c.mk
index 6d347ae..15a7132 100644
--- a/src/json-c.mk
+++ b/src/json-c.mk
@@ -27,7 +27,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-json-c.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-json-c.exe' \
         `'$(TARGET)-pkg-config' json-c --cflags --libs`
 endef
 
diff --git a/src/lapack.mk b/src/lapack.mk
index 2b4712e..5554779 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -29,11 +29,11 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gfortran' \
         -W -Wall -Werror -pedantic \
-        '$(2).f' -o '$(PREFIX)/$(TARGET)/bin/test-lapack.exe' \
+        '$(PWD)/src/$(PKG)-test.f' -o '$(PREFIX)/$(TARGET)/bin/test-lapack.exe' \
         -llapack
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lapacke.exe' \
+        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-lapacke.exe' \
         -llapacke -llapack -lcblas -lblas -lgfortran -lquadmath
 endef
diff --git a/src/lensfun.mk b/src/lensfun.mk
index 1062b55..bdace90 100644
--- a/src/lensfun.mk
+++ b/src/lensfun.mk
@@ -28,6 +28,6 @@ define $(PKG)_BUILD
     # Don't use `-ansi`, as lensfun uses C++-style `//` comments.
     '$(TARGET)-gcc' \
         -W -Wall -Werror \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lensfun.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-lensfun.exe' \
         `'$(TARGET)-pkg-config' lensfun glib-2.0 --cflags --libs`
 endef
diff --git a/src/libaacs.mk b/src/libaacs.mk
index 0f4c2f3..2ffcfc8 100644
--- a/src/libaacs.mk
+++ b/src/libaacs.mk
@@ -28,7 +28,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' \
+        '$(TEST_FILE)' \
         -o '$(PREFIX)/$(TARGET)/bin/test-libaacs.exe' \
         `'$(TARGET)-pkg-config' libaacs --cflags --libs`
 endef
diff --git a/src/libarchive.mk b/src/libarchive.mk
index be970ba..3c8da95 100644
--- a/src/libarchive.mk
+++ b/src/libarchive.mk
@@ -32,6 +32,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \
         `'$(TARGET)-pkg-config' --libs-only-l libarchive`
 endef
diff --git a/src/libass.mk b/src/libass.mk
index 812ce74..d781ce6 100644
--- a/src/libass.mk
+++ b/src/libass.mk
@@ -32,6 +32,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libass.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libass.exe' \
         `'$(TARGET)-pkg-config' libass --cflags --libs`
 endef
diff --git a/src/libechonest.mk b/src/libechonest.mk
index 3c73ff3..2e35c44 100644
--- a/src/libechonest.mk
+++ b/src/libechonest.mk
@@ -31,7 +31,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' libechonest --cflags --libs`
 endef
 
diff --git a/src/libffi.mk b/src/libffi.mk
index 6ebb17a..195321c 100644
--- a/src/libffi.mk
+++ b/src/libffi.mk
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libffi.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libffi.exe' \
         `'$(TARGET)-pkg-config' libffi --cflags --libs`
 endef
diff --git a/src/libftdi1.mk b/src/libftdi1.mk
index d337b02..ca14220 100644
--- a/src/libftdi1.mk
+++ b/src/libftdi1.mk
@@ -32,6 +32,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Wextra -Werror \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libftdi1.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libftdi1.exe' \
         `'$(TARGET)-pkg-config' libftdi1 --cflags --libs`
 endef
diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk
index 2a30952..55d4c60 100644
--- a/src/libgcrypt.mk
+++ b/src/libgcrypt.mk
@@ -30,7 +30,7 @@ define $(PKG)_MAKE
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \
         `$(TARGET)-libgcrypt-config --cflags --libs`
 endef
 
diff --git a/src/libgsasl.mk b/src/libgsasl.mk
index afdf972..55d592b 100644
--- a/src/libgsasl.mk
+++ b/src/libgsasl.mk
@@ -29,6 +29,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgsasl.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libgsasl.exe' \
         `'$(TARGET)-pkg-config' libgsasl --cflags --libs`
 endef
diff --git a/src/libiberty.mk b/src/libiberty.mk
index 08c3848..147b81e 100644
--- a/src/libiberty.mk
+++ b/src/libiberty.mk
@@ -27,7 +27,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libiberty.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libiberty.exe' \
         -I$(PREFIX)/$(TARGET)/include/libiberty -liberty
 endef
 
diff --git a/src/libical.mk b/src/libical.mk
index f1106cb..658f564 100644
--- a/src/libical.mk
+++ b/src/libical.mk
@@ -25,6 +25,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libical.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libical.exe' \
         `'$(TARGET)-pkg-config' libical --cflags --libs`
 endef
diff --git a/src/libidn.mk b/src/libidn.mk
index b176cc5..347faf0 100644
--- a/src/libidn.mk
+++ b/src/libidn.mk
@@ -27,6 +27,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libidn.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libidn.exe' \
         `'$(TARGET)-pkg-config' libidn --cflags --libs`
 endef
diff --git a/src/libircclient.mk b/src/libircclient.mk
index 98bcb31..0ac24c8 100644
--- a/src/libircclient.mk
+++ b/src/libircclient.mk
@@ -37,7 +37,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-libircclient.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libircclient.exe' \
         -lircclient -lws2_32
 endef
 
diff --git a/src/liblaxjson.mk b/src/liblaxjson.mk
index 6268a2a..3bba201 100644
--- a/src/liblaxjson.mk
+++ b/src/liblaxjson.mk
@@ -31,6 +31,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic -std=c99 \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-liblaxjson.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-liblaxjson.exe' \
         -llaxjson
 endef
diff --git a/src/libmicrohttpd.mk b/src/libmicrohttpd.mk
index 8e933ec..20b4aff 100644
--- a/src/libmicrohttpd.mk
+++ b/src/libmicrohttpd.mk
@@ -33,7 +33,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic -Wno-error=unused-parameter \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmicrohttpd.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libmicrohttpd.exe' \
         `'$(TARGET)-pkg-config' --cflags --libs libmicrohttpd`
 endef
 
diff --git a/src/libmikmod.mk b/src/libmikmod.mk
index a3c3e36..1b597fd 100644
--- a/src/libmikmod.mk
+++ b/src/libmikmod.mk
@@ -27,6 +27,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmikmod.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libmikmod.exe' \
         `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --cflags --libs`
 endef
diff --git a/src/libmodplug.mk b/src/libmodplug.mk
index 560431f..01335c8 100644
--- a/src/libmodplug.mk
+++ b/src/libmodplug.mk
@@ -23,6 +23,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmodplug.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libmodplug.exe' \
         `'$(TARGET)-pkg-config' libmodplug --cflags --libs`
 endef
diff --git a/src/libmysqlclient.mk b/src/libmysqlclient.mk
index ee22205..b805e5e 100644
--- a/src/libmysqlclient.mk
+++ b/src/libmysqlclient.mk
@@ -53,6 +53,6 @@ define $(PKG)_BUILD
     # build test with mysql_config
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(PREFIX)/$(TARGET)/bin/mysql_config' --cflags --libs`
 endef
diff --git a/src/liboauth.mk b/src/liboauth.mk
index c8f78f6..56a0c2e 100644
--- a/src/liboauth.mk
+++ b/src/liboauth.mk
@@ -25,6 +25,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-liboauth.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-liboauth.exe' \
         `'$(TARGET)-pkg-config' oauth --cflags --libs`
 endef
diff --git a/src/libpng.mk b/src/libpng.mk
index 1e54805..191abe8 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -29,6 +29,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libpng.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libpng.exe' \
         `'$(PREFIX)/$(TARGET)/bin/libpng-config' --static --cflags --libs`
 endef
diff --git a/src/librsvg.mk b/src/librsvg.mk
index 75d865e..fde4e18 100644
--- a/src/librsvg.mk
+++ b/src/librsvg.mk
@@ -27,6 +27,6 @@ define $(PKG)_BUILD
     '$(TARGET)-gcc' \
         -mwindows -W -Wall -Werror -Wno-error=deprecated-declarations \
         -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-librsvg.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-librsvg.exe' \
         `'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs`
 endef
diff --git a/src/libsoup.mk b/src/libsoup.mk
index c1392c4..298435e 100644
--- a/src/libsoup.mk
+++ b/src/libsoup.mk
@@ -29,6 +29,6 @@ define $(PKG)_BUILD
 
     $(TARGET)-gcc \
         -W -Wall -Werror -ansi \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `$(TARGET)-pkg-config $(PKG)-$($(PKG)_APIVER) --cflags --libs`
 endef
diff --git a/src/libssh2.mk b/src/libssh2.mk
index 19b89c2..80742a8 100644
--- a/src/libssh2.mk
+++ b/src/libssh2.mk
@@ -29,6 +29,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \
         `'$(TARGET)-pkg-config' --cflags --libs libssh2`
 endef
diff --git a/src/libusb1.mk b/src/libusb1.mk
index 71e9efe..fbe75d7 100644
--- a/src/libusb1.mk
+++ b/src/libusb1.mk
@@ -25,6 +25,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Wextra -Werror \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libusb1.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libusb1.exe' \
         `'$(TARGET)-pkg-config' libusb-1.0 --cflags --libs`
 endef
diff --git a/src/libuv.mk b/src/libuv.mk
index 9ad02de..ff84a47 100644
--- a/src/libuv.mk
+++ b/src/libuv.mk
@@ -23,6 +23,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' $(PKG) --libs`
 endef
diff --git a/src/libzip.mk b/src/libzip.mk
index 9d1e189..9146bff 100644
--- a/src/libzip.mk
+++ b/src/libzip.mk
@@ -23,6 +23,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libzip.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libzip.exe' \
         `'$(TARGET)-pkg-config' libzip --cflags --libs`
 endef
diff --git a/src/log4cxx.mk b/src/log4cxx.mk
index d31072a..0de1537 100644
--- a/src/log4cxx.mk
+++ b/src/log4cxx.mk
@@ -30,7 +30,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-log4cxx.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-log4cxx.exe' \
         `$(TARGET)-pkg-config liblog4cxx --libs`
 endef
 
diff --git a/src/lua.mk b/src/lua.mk
index 908e2c7..6eed7d0 100644
--- a/src/lua.mk
+++ b/src/lua.mk
@@ -34,7 +34,7 @@ define $(PKG)_BUILD_COMMON
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lua.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-lua.exe' \
         `$(TARGET)-pkg-config --libs lua`
 endef
 
diff --git a/src/luabind.mk b/src/luabind.mk
index c8c2e9d..2c306d2 100644
--- a/src/luabind.mk
+++ b/src/luabind.mk
@@ -26,7 +26,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-luabind.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-luabind.exe' \
         -llua -lluabind
 endef
 
diff --git a/src/muparserx.mk b/src/muparserx.mk
index 34f22b1..4e4522e 100644
--- a/src/muparserx.mk
+++ b/src/muparserx.mk
@@ -21,6 +21,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
 endef
diff --git a/src/mxml.mk b/src/mxml.mk
index 876c41d..8f6493f 100644
--- a/src/mxml.mk
+++ b/src/mxml.mk
@@ -31,7 +31,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-mxml.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-mxml.exe' \
         `'$(TARGET)-pkg-config' mxml --cflags --libs`
 endef
 
diff --git a/src/ocaml-cairo.mk b/src/ocaml-cairo.mk
index c93914a..d637e5f 100644
--- a/src/ocaml-cairo.mk
+++ b/src/ocaml-cairo.mk
@@ -30,7 +30,7 @@ define $(PKG)_BUILD
         -package lablgtk2.auto-init \
         -package cairo.lablgtk2 \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        < '$(2).ml'
+        < '$(TEST_FILE)'
 endef
 
 $(PKG)_BUILD_x86_64-w64-mingw32 =
diff --git a/src/ocaml-camlimages.mk b/src/ocaml-camlimages.mk
index 7e49b6e..41c8e39 100644
--- a/src/ocaml-camlimages.mk
+++ b/src/ocaml-camlimages.mk
@@ -34,7 +34,7 @@ define $(PKG)_BUILD
     '$(TARGET)-ocamlfind' opt -linkpkg \
         -package camlimages \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        < '$(2).ml'
+        < '$(TEST_FILE)'
 endef
 
 $(PKG)_BUILD_x86_64-w64-mingw32 =
diff --git a/src/ocaml-core.mk b/src/ocaml-core.mk
index d587716..eb255ce 100644
--- a/src/ocaml-core.mk
+++ b/src/ocaml-core.mk
@@ -113,10 +113,10 @@ define $(PKG)_BUILD
     done
 
     # test ocamlopt
-    cp '$(2).ml' '$(1)/test.ml'
+    cp '$(TEST_FILE)' '$(1)/test.ml'
     cd '$(1)' && '$(TARGET)-ocamlopt' test.ml
     # test ocamlbuild from package ocaml-native, now that ocamlopt works
-    mkdir '$(1)/tmp' && cp '$(2).ml' '$(1)/tmp/test.ml'
+    mkdir '$(1)/tmp' && cp '$(TEST_FILE)' '$(1)/tmp/test.ml'
     cd '$(1)/tmp' && $(TARGET)-ocamlbuild test.native
 endef
 
diff --git a/src/ocaml-findlib.mk b/src/ocaml-findlib.mk
index d4036a5..db9b2f7 100644
--- a/src/ocaml-findlib.mk
+++ b/src/ocaml-findlib.mk
@@ -52,7 +52,7 @@ define $(PKG)_BUILD
     # test
     '$(TARGET)-ocamlfind' opt \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        < '$(2).ml'
+        < '$(TEST_FILE)'
 
 endef
 
diff --git a/src/ocaml-lablgtk2.mk b/src/ocaml-lablgtk2.mk
index e362fa8..8c41105 100644
--- a/src/ocaml-lablgtk2.mk
+++ b/src/ocaml-lablgtk2.mk
@@ -30,7 +30,7 @@ define $(PKG)_BUILD
     '$(TARGET)-ocamlfind' opt -linkpkg \
         -package lablgtk2.gl \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        < '$(2).ml'
+        < '$(TEST_FILE)'
 endef
 
 $(PKG)_BUILD_x86_64-w64-mingw32 =
diff --git a/src/openal.mk b/src/openal.mk
index a759692..50561d3 100644
--- a/src/openal.mk
+++ b/src/openal.mk
@@ -27,6 +27,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-openal.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-openal.exe' \
         `'$(TARGET)-pkg-config' openal --cflags --libs`
 endef
diff --git a/src/openexr.mk b/src/openexr.mk
index 57a59a1..139414d 100644
--- a/src/openexr.mk
+++ b/src/openexr.mk
@@ -62,6 +62,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -Wall -Wextra -std=gnu++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-openexr.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-openexr.exe' \
         `'$(TARGET)-pkg-config' OpenEXR --cflags --libs`
 endef
diff --git a/src/pfstools.mk b/src/pfstools.mk
index 2979d4c..b938580 100644
--- a/src/pfstools.mk
+++ b/src/pfstools.mk
@@ -38,7 +38,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -Wall -Wextra -Werror \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-pfstools.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-pfstools.exe' \
         `'$(TARGET)-pkg-config' pfs --cflags --libs`
 endef
 
diff --git a/src/physfs.mk b/src/physfs.mk
index 596d89b..d1509bb 100644
--- a/src/physfs.mk
+++ b/src/physfs.mk
@@ -31,7 +31,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic -std=c99 \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-physfs.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-physfs.exe' \
         -lphysfs -lz
 endef
 
diff --git a/src/plibc.mk b/src/plibc.mk
index 112108a..2e883c9 100644
--- a/src/plibc.mk
+++ b/src/plibc.mk
@@ -35,7 +35,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-plibc.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-plibc.exe' \
         `'$(TARGET)-pkg-config' --cflags --libs plibc`
 endef
 
diff --git a/src/poco.mk b/src/poco.mk
index d7a5623..4eebd4f 100644
--- a/src/poco.mk
+++ b/src/poco.mk
@@ -32,7 +32,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic -DPOCO_STATIC=1 \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-poco.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-poco.exe' \
         -lPocoFoundation
 endef
 
diff --git a/src/poppler.mk b/src/poppler.mk
index 35fe2ff..f4baff9 100644
--- a/src/poppler.mk
+++ b/src/poppler.mk
@@ -61,6 +61,6 @@ define $(PKG)_BUILD
     # Test program
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
         `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs`
 endef
diff --git a/src/portaudio.mk b/src/portaudio.mk
index 5430eff..cbf57f8 100644
--- a/src/portaudio.mk
+++ b/src/portaudio.mk
@@ -36,6 +36,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portaudio.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-portaudio.exe' \
         `'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs`
 endef
diff --git a/src/portmidi.mk b/src/portmidi.mk
index 5e697b5..4a8b6a6 100644
--- a/src/portmidi.mk
+++ b/src/portmidi.mk
@@ -42,6 +42,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portmidi.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-portmidi.exe' \
         -lportmidi -lwinmm
 endef
diff --git a/src/protobuf.mk b/src/protobuf.mk
index 5e8596e..167326f 100644
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@@ -31,6 +31,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-protobuf.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-protobuf.exe' \
         `'$(TARGET)-pkg-config' protobuf --cflags --libs`
 endef
diff --git a/src/qdbm.mk b/src/qdbm.mk
index 933ca88..04e0cca 100644
--- a/src/qdbm.mk
+++ b/src/qdbm.mk
@@ -44,7 +44,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-qdbm.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-qdbm.exe' \
         `'$(TARGET)-pkg-config' qdbm --cflags --libs`
 endef
 
diff --git a/src/qjson.mk b/src/qjson.mk
index 375918d..e1c37a6 100644
--- a/src/qjson.mk
+++ b/src/qjson.mk
@@ -25,6 +25,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' QJson --cflags --libs`
 endef
diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk
index 9013a0e..c98fdd3 100644
--- a/src/qscintilla2.mk
+++ b/src/qscintilla2.mk
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
     '$(TARGET)-g++' \
         -W -Wall -Werror -std=c++0x -pedantic \
         `'$(TARGET)-pkg-config' Qt5Widgets --cflags` \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2 \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2 \
         `'$(TARGET)-pkg-config' Qt5Widgets --libs`
 endef
diff --git a/src/qt.mk b/src/qt.mk
index d27214a..aa68c03 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -103,7 +103,7 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install
 
     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/'
 
diff --git a/src/qtsparkle_qt4.mk b/src/qtsparkle_qt4.mk
index bf194b6..9d26fc6 100644
--- a/src/qtsparkle_qt4.mk
+++ b/src/qtsparkle_qt4.mk
@@ -38,6 +38,6 @@ define $(PKG)_BUILD
 
     $(TARGET)-g++ \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `$(TARGET)-pkg-config $(PKG) --cflags --libs`
 endef
diff --git a/src/rucksack.mk b/src/rucksack.mk
index 01d6c66..3da4cfd 100644
--- a/src/rucksack.mk
+++ b/src/rucksack.mk
@@ -32,7 +32,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic -std=c99 \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-rucksack.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-rucksack.exe' \
         -lrucksack -llaxjson \
         `'$(TARGET)-pkg-config' freeimage --cflags --libs`
 endef
diff --git a/src/sdl.mk b/src/sdl.mk
index d0b033c..16381f8 100644
--- a/src/sdl.mk
+++ b/src/sdl.mk
@@ -31,7 +31,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl.exe' \
+        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl.exe' \
         `'$(TARGET)-pkg-config' sdl --cflags --libs`
 
     # test cmake
diff --git a/src/sdl2.mk b/src/sdl2.mk
index c2cb32b..d678c61 100644
--- a/src/sdl2.mk
+++ b/src/sdl2.mk
@@ -30,7 +30,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2.exe' \
         `'$(TARGET)-pkg-config' sdl2 --cflags --libs`
 
 endef
diff --git a/src/sdl2_gfx.mk b/src/sdl2_gfx.mk
index 370b5a8..9028ba8 100644
--- a/src/sdl2_gfx.mk
+++ b/src/sdl2_gfx.mk
@@ -27,6 +27,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_gfx.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_gfx.exe' \
         `'$(TARGET)-pkg-config' SDL2_gfx --cflags --libs`
 endef
diff --git a/src/sdl2_net.mk b/src/sdl2_net.mk
index f73c04d..543eebb 100644
--- a/src/sdl2_net.mk
+++ b/src/sdl2_net.mk
@@ -26,7 +26,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_net.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_net.exe' \
         `'$(TARGET)-pkg-config' SDL2_net --cflags --libs` \
         -lws2_32 -liphlpapi
 endef
diff --git a/src/sdl_gfx.mk b/src/sdl_gfx.mk
index bfd0860..ea1e2ed 100644
--- a/src/sdl_gfx.mk
+++ b/src/sdl_gfx.mk
@@ -25,6 +25,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_gfx.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_gfx.exe' \
         `'$(TARGET)-pkg-config' SDL_gfx --cflags --libs`
 endef
diff --git a/src/sdl_image.mk b/src/sdl_image.mk
index b6cf2bf..032df69 100644
--- a/src/sdl_image.mk
+++ b/src/sdl_image.mk
@@ -36,12 +36,12 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_image.exe' \
+        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_image.exe' \
         `'$(TARGET)-pkg-config' SDL_image --cflags --libs`
 
     mkdir -p '$(1)/cmake-build-test'
-    cp '$(2)-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
-    cp '$(2).c' '$(1)/cmake-build-test/'
+    cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
+    cp '$(PWD)/src/$(PKG)-test.c' '$(1)/cmake-build-test/'
     cd '$(1)/cmake-build-test' && cmake . \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
     $(MAKE) -C '$(1)/cmake-build-test' -j '$(JOBS)'
diff --git a/src/sdl_mixer.mk b/src/sdl_mixer.mk
index 01a9336..a751bb8 100644
--- a/src/sdl_mixer.mk
+++ b/src/sdl_mixer.mk
@@ -49,7 +49,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_mixer.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_mixer.exe' \
         `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs`
 endef
 
diff --git a/src/sdl_net.mk b/src/sdl_net.mk
index 2ce655e..a77e1f7 100644
--- a/src/sdl_net.mk
+++ b/src/sdl_net.mk
@@ -29,7 +29,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_net.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_net.exe' \
         `'$(TARGET)-pkg-config' SDL_net --cflags --libs`
 endef
 
diff --git a/src/sdl_rwhttp.mk b/src/sdl_rwhttp.mk
index 1b34294..563f186 100644
--- a/src/sdl_rwhttp.mk
+++ b/src/sdl_rwhttp.mk
@@ -27,7 +27,7 @@ define $(PKG)_BUILD
 
 #    '$(TARGET)-gcc' \
 #        -W -Wall -Werror -ansi -pedantic \
-#        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_rwhttp.exe' \
+#        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_rwhttp.exe' \
 #        `'$(TARGET)-pkg-config' SDL_rwhttp --cflags --libs`
 endef
 
diff --git a/src/sdl_sound.mk b/src/sdl_sound.mk
index 81e4d23..94bffc5 100644
--- a/src/sdl_sound.mk
+++ b/src/sdl_sound.mk
@@ -55,12 +55,12 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \
+        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \
         `'$(TARGET)-pkg-config' SDL_sound --cflags --libs`
 
     mkdir -p '$(1)/cmake-build-test'
-    cp '$(2)-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
-    cp '$(2).c' '$(1)/cmake-build-test/'
+    cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
+    cp '$(PWD)/src/$(PKG)-test.c' '$(1)/cmake-build-test/'
     cd '$(1)/cmake-build-test' && cmake . \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
     $(MAKE) -C '$(1)/cmake-build-test' -j '$(JOBS)'
diff --git a/src/sfml.mk b/src/sfml.mk
index 1ba24d4..75719c6 100644
--- a/src/sfml.mk
+++ b/src/sfml.mk
@@ -41,7 +41,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-sfml.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sfml.exe' \
         `$(TARGET)-pkg-config --cflags --libs sfml`
 endef
 
diff --git a/src/smpeg.mk b/src/smpeg.mk
index be276e7..7fec70d 100644
--- a/src/smpeg.mk
+++ b/src/smpeg.mk
@@ -34,7 +34,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-smpeg.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-smpeg.exe' \
         `'$(PREFIX)/$(TARGET)/bin/smpeg-config' --cflags --libs`
 endef
 
diff --git a/src/sox.mk b/src/sox.mk
index ac613d1..9e49e7b 100644
--- a/src/sox.mk
+++ b/src/sox.mk
@@ -61,7 +61,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sox.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sox.exe' \
         `'$(TARGET)-pkg-config' sox --cflags --libs`
 endef
 
diff --git a/src/subversion.mk b/src/subversion.mk
index 17bd540..52caa8d 100644
--- a/src/subversion.mk
+++ b/src/subversion.mk
@@ -43,7 +43,7 @@ define $(PKG)_BUILD
         install
     '$(TARGET)-gcc' \
        -mwindows -W -Wall -Werror -pedantic \
-       '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-subversion.exe' \
+       '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-subversion.exe' \
        `'$(TARGET)-pkg-config' libsvn_client --cflags --libs` -lole32
 endef
 
diff --git a/src/vidstab.mk b/src/vidstab.mk
index 191bea8..82e57ad 100644
--- a/src/vidstab.mk
+++ b/src/vidstab.mk
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-vidstab.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-vidstab.exe' \
         `'$(TARGET)-pkg-config' --static --cflags --libs vidstab`
 endef
\ No newline at end of file
diff --git a/src/vigra.mk b/src/vigra.mk
index cc4ee6c..d1c4f30 100644
--- a/src/vigra.mk
+++ b/src/vigra.mk
@@ -36,7 +36,7 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
 
     $(TARGET)-g++ \
-        '$(2).cpp' -o $(PREFIX)/$(TARGET)/bin/test-vigra.exe \
+        '$(TEST_FILE)' -o $(PREFIX)/$(TARGET)/bin/test-vigra.exe \
         -DVIGRA_STATIC_LIB \
         -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg
 endef
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk
index 9ffa70b..42485b8 100644
--- a/src/wxwidgets.mk
+++ b/src/wxwidgets.mk
@@ -73,7 +73,7 @@ define $(PKG)_BUILD
     # build test program
     '$(TARGET)-g++' \
         -W -Wall -Werror -Wno-error=unused-local-typedefs -pedantic -std=gnu++0x \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-wxwidgets.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-wxwidgets.exe' \
         `'$(TARGET)-wx-config' --cflags --libs`
 endef
 
diff --git a/src/xerces.mk b/src/xerces.mk
index dbbed83..cc3d113 100644
--- a/src/xerces.mk
+++ b/src/xerces.mk
@@ -47,7 +47,7 @@ define $(PKG)_BUILD
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-xerces.exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-xerces.exe' \
         `'$(TARGET)-pkg-config' xerces-c --cflags --libs`
 endef
 
diff --git a/src/xxhash.mk b/src/xxhash.mk
index 68f2889..f582ca2 100644
--- a/src/xxhash.mk
+++ b/src/xxhash.mk
@@ -34,6 +34,6 @@ define $(PKG)_BUILD
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
 endef
-- 
cgit v0.12