standardize subproject dependencies

use project names instead of the generated makefile targets.

Change-Id: I024da821ecb012d653065b130431d5aedcf15341
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

src/src.pro

@@ -4,32 +4,32 @@ include(config.pri)
 
 !disable-hunspell:exists(virtualkeyboard/3rdparty/hunspell/src/hunspell/hunspell.h) {
     SUBDIRS += virtualkeyboard/3rdparty/hunspell
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-hunspell
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/hunspell
 }
 
 openwnn {
     SUBDIRS += virtualkeyboard/3rdparty/openwnn
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-openwnn
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/openwnn
 }
 
 pinyin {
     SUBDIRS += virtualkeyboard/3rdparty/pinyin
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-pinyin
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/pinyin
 }
 
 tcime {
     SUBDIRS += virtualkeyboard/3rdparty/tcime
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-tcime
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/tcime
 }
 
 lipi-toolkit {
     SUBDIRS += virtualkeyboard/3rdparty/lipi-toolkit
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-lipi-toolkit
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/lipi-toolkit
 }
 
 t9write {
     SUBDIRS += virtualkeyboard/3rdparty/t9write
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-t9write
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/t9write
 }
 
 SUBDIRS += \

src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro

@@ -4,4 +4,4 @@ SUBDIRS += \
     shaperec \
     wordrec
 
-wordrec.depends = sub-shaperec
+wordrec.depends = shaperec

src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro

@@ -7,7 +7,7 @@ SUBDIRS += \
     pointfloat \
     substroke
 
-l7.depends = sub-common
-npen.depends = sub-common
-pointfloat.depends = sub-common
-substroke.depends = sub-common
+l7.depends = common
+npen.depends = common
+pointfloat.depends = common
+substroke.depends = common

src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro

@@ -8,7 +8,7 @@ SUBDIRS += \
     nn \
     preprocessing
 
-activedtw.depends = sub-common sub-featureextractor
-neuralnet.depends = sub-common sub-featureextractor
-nn.depends = sub-common sub-featureextractor
-preprocessing.depends = sub-common
+activedtw.depends = common featureextractor
+neuralnet.depends = common featureextractor
+nn.depends = common featureextractor
+preprocessing.depends = common

src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro

@@ -4,4 +4,4 @@ SUBDIRS += \
     common \
     boxfld
 
-boxfld.depends = sub-common
+boxfld.depends = common

src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro

@@ -7,6 +7,4 @@ SUBDIRS += \
     reco \
     lipiengine
 
-lipiengine.depends = sub-common sub-util sub-reco
-
-CONFIG += ordered
+lipiengine.depends = common util reco

src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro

@@ -4,4 +4,4 @@ SUBDIRS += \
     lib \
     logger
 
-logger.depends = sub-lib
+logger.depends = lib