diff options
7 files changed, 18 insertions, 20 deletions
diff --git a/src/src.pro b/src/src.pro index 23c27d22..542db7f3 100644 --- a/src/src.pro +++ b/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 += \ 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 |