diff sonic-annotator.pro @ 288:fd4a6183482f kapoor_1202

Merge from branch piper-nopiper. The next release will be based on this.

--- a/sonic-annotator.pro	Mon Nov 21 16:32:58 2016 +0000
+++ b/sonic-annotator.pro	Fri Dec 02 10:04:44 2016 +0000
@@ -1,14 +1,20 @@
 TEMPLATE = subdirs
-SUBDIRS = sub_dataquay svcore sub_runner
 
 !win* {
     # We should build and run the tests on any platform,
     # but doing it automatically doesn't work so well from
     # within an IDE on Windows, so remove that from here
-    SUBDIRS += svcore/data/fileio/test
+    SUBDIRS += \
+	sub_test_svcore_base \
+        sub_test_svcore_data_fileio
 }
 
-sub_dataquay.file = dataquay/lib.pro
+SUBDIRS += sub_runner
+
+sub_test_svcore_base.file = test-svcore-base.pro
+sub_test_svcore_data_fileio.file = test-svcore-data-fileio.pro
 
 sub_runner.file = runner.pro
-sub_runner.depends = svcore
+
+CONFIG += ordered
+