diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-04 14:22:26 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-08 18:31:08 +0000 |
| commit | a112c4f671eeef9777e09b4b5dd3e0a7c0de7ad2 (patch) | |
| tree | 0c3fa14101483e0f037c9c43b139d2e6772e14a9 /src/virtualkeyboard/3rdparty | |
| parent | 0c490f95366b3c7372c598b2d94d9f237590fc26 (diff) | |
standardize subproject dependencies
use project names instead of the generated makefile targets.
Change-Id: I024da821ecb012d653065b130431d5aedcf15341
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard/3rdparty')
6 files changed, 12 insertions, 14 deletions
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro index 9fb4fde7..72efcc7f 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro @@ -4,4 +4,4 @@ SUBDIRS += \ shaperec \ wordrec -wordrec.depends = sub-shaperec +wordrec.depends = shaperec diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro index 134b67a7..538b9f29 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro +++ b/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 diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro index 46331a24..8b5d5e3b 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro +++ b/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 diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro index b1a2cd5e..cf49e45d 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro @@ -4,4 +4,4 @@ SUBDIRS += \ common \ boxfld -boxfld.depends = sub-common +boxfld.depends = common diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro index 92c5c52e..bc3b94ce 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro +++ b/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 diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro index 02a64c14..79cfc027 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro @@ -4,4 +4,4 @@ SUBDIRS += \ lib \ logger -logger.depends = sub-lib +logger.depends = lib |