From eedac19face3adc38c19a91a9603cefd6d1db47b Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sat, 17 Aug 2013 20:33:30 +0300 Subject: [PATCH] Use expat from the system on Linux --- 3party/expat/expat.pro | 1 - 3party/freetype/freetype.pro | 1 - 3party/fribidi/fribidi.pro | 1 - 3party/gflags/gflags.pro | 1 - 3party/protobuf/protobuf.pro | 1 - 3party/sgitess/sgitess.pro | 1 - anim/anim.pro | 1 - base/base.pro | 1 - coding/coding.pro | 1 - common.pri | 5 ++++- generator/generator.pro | 1 - geometry/geometry.pro | 1 - graphics/graphics.pro | 1 - gui/gui.pro | 1 - indexer/indexer.pro | 1 - map/map.pro | 1 - platform/platform.pro | 1 - qt_tstfrm/qt_tstfrm.pro | 1 - search/search.pro | 1 - storage/storage.pro | 2 -- storage/storage_tests/storage_tests.pro | 2 +- 21 files changed, 5 insertions(+), 22 deletions(-) diff --git a/3party/expat/expat.pro b/3party/expat/expat.pro index ce2a77991e..d4c4fccc98 100644 --- a/3party/expat/expat.pro +++ b/3party/expat/expat.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib ROOT_DIR = ../.. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/3party/freetype/freetype.pro b/3party/freetype/freetype.pro index 28307da467..0fd9263887 100644 --- a/3party/freetype/freetype.pro +++ b/3party/freetype/freetype.pro @@ -4,7 +4,6 @@ INCLUDEPATH += ./include DEFINES += FT2_BUILD_LIBRARY \ ROOT_DIR = ../.. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/3party/fribidi/fribidi.pro b/3party/fribidi/fribidi.pro index 3053cf371a..4b1f2f86c2 100644 --- a/3party/fribidi/fribidi.pro +++ b/3party/fribidi/fribidi.pro @@ -6,7 +6,6 @@ CONFIG += staticlib INCLUDEPATH += ./lib ROOT_DIR = ../.. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/3party/gflags/gflags.pro b/3party/gflags/gflags.pro index 591f9ac724..cc8476ec01 100644 --- a/3party/gflags/gflags.pro +++ b/3party/gflags/gflags.pro @@ -1,6 +1,5 @@ TARGET = gflags ROOT_DIR = ../.. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/3party/protobuf/protobuf.pro b/3party/protobuf/protobuf.pro index 5123da605b..6718a6fb6d 100644 --- a/3party/protobuf/protobuf.pro +++ b/3party/protobuf/protobuf.pro @@ -6,7 +6,6 @@ CONFIG += staticlib INCLUDEPATH += ./src ROOT_DIR = ../.. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/3party/sgitess/sgitess.pro b/3party/sgitess/sgitess.pro index f7d31ef853..be200072df 100644 --- a/3party/sgitess/sgitess.pro +++ b/3party/sgitess/sgitess.pro @@ -3,7 +3,6 @@ TEMPLATE = lib CONFIG += staticlib ROOT_DIR = ../.. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/anim/anim.pro b/anim/anim.pro index d2c2935069..068320af0c 100644 --- a/anim/anim.pro +++ b/anim/anim.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = geometry coding base expat include($$ROOT_DIR/common.pri) diff --git a/base/base.pro b/base/base.pro index a1ff0ea6c1..e4b5e962f5 100644 --- a/base/base.pro +++ b/base/base.pro @@ -4,7 +4,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = include($$ROOT_DIR/common.pri) diff --git a/coding/coding.pro b/coding/coding.pro index 0dce42303b..b87816960c 100644 --- a/coding/coding.pro +++ b/coding/coding.pro @@ -4,7 +4,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = base bzip2 zlib tomcrypt include($$ROOT_DIR/common.pri) diff --git a/common.pri b/common.pri index e37adc4afb..758a8eb5e7 100644 --- a/common.pri +++ b/common.pri @@ -55,7 +55,10 @@ unix|win32-g++|bada-simulator { # Add libraries' dependencies. for(project, DEPENDENCIES) { - PRE_TARGETDEPS += $$BINARIES_PATH/$$LIB_PREFIX$$project$$LIB_EXT + equals(project,expat):linux* { + } else { + PRE_TARGETDEPS += $$BINARIES_PATH/$$LIB_PREFIX$$project$$LIB_EXT + } LIBS += -l$$project } diff --git a/generator/generator.pro b/generator/generator.pro index 36783852f4..ea022b215b 100644 --- a/generator/generator.pro +++ b/generator/generator.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = storage indexer geometry coding base expat include($$ROOT_DIR/common.pri) diff --git a/geometry/geometry.pro b/geometry/geometry.pro index 478f9ce0bd..9e5f99fbca 100644 --- a/geometry/geometry.pro +++ b/geometry/geometry.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = base include($$ROOT_DIR/common.pri) diff --git a/graphics/graphics.pro b/graphics/graphics.pro index 61284ecaaa..3e3bdfb591 100644 --- a/graphics/graphics.pro +++ b/graphics/graphics.pro @@ -6,7 +6,6 @@ CONFIG += staticlib warn_on DEFINES += GRAPHICS_LIBRARY ROOT_DIR = .. -DEPENDENCIES = geometry platform coding base freetype fribidi expat INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg diff --git a/gui/gui.pro b/gui/gui.pro index eca9d0a164..571ee1679a 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = graphics geometry coding base expat zlib include($$ROOT_DIR/common.pri) diff --git a/indexer/indexer.pro b/indexer/indexer.pro index a40d692c90..393cc5a6ec 100644 --- a/indexer/indexer.pro +++ b/indexer/indexer.pro @@ -6,7 +6,6 @@ CONFIG += staticlib warn_on INCLUDEPATH += ../3party/protobuf/src ROOT_DIR = .. -DEPENDENCIES = geometry coding base expat protobuf include($$ROOT_DIR/common.pri) diff --git a/map/map.pro b/map/map.pro index 0a4c93eab3..8816e2d440 100644 --- a/map/map.pro +++ b/map/map.pro @@ -6,7 +6,6 @@ CONFIG += staticlib warn_on INCLUDEPATH += ../3party/protobuf/src ROOT_DIR = .. -DEPENDENCIES = search gui graphics indexer anim geometry coding base expat # use expat from the system on linux !linux*: INCLUDEPATH *= ../3party/expat/lib diff --git a/platform/platform.pro b/platform/platform.pro index cbba303f67..07493c601d 100644 --- a/platform/platform.pro +++ b/platform/platform.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = coding base jansson include($$ROOT_DIR/common.pri) diff --git a/qt_tstfrm/qt_tstfrm.pro b/qt_tstfrm/qt_tstfrm.pro index cc1d90eebf..f71ac76c08 100644 --- a/qt_tstfrm/qt_tstfrm.pro +++ b/qt_tstfrm/qt_tstfrm.pro @@ -3,7 +3,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = map graphics geometry coding base include($$ROOT_DIR/common.pri) diff --git a/search/search.pro b/search/search.pro index b7c5939ac2..53a4ac77d1 100644 --- a/search/search.pro +++ b/search/search.pro @@ -5,7 +5,6 @@ TEMPLATE = lib CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = storage indexer geometry coding base include($$ROOT_DIR/common.pri) diff --git a/storage/storage.pro b/storage/storage.pro index 242e0cbb18..29913f1b13 100644 --- a/storage/storage.pro +++ b/storage/storage.pro @@ -6,8 +6,6 @@ CONFIG += staticlib warn_on ROOT_DIR = .. -DEPENDENCIES = indexer geometry coding base jansson - include($$ROOT_DIR/common.pri) INCLUDEPATH += $$ROOT_DIR/3party/jansson/src diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index 1295906b67..d779026f19 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = storage indexer platform coding base jansson tomcrypt expat +DEPENDENCIES = storage indexer platform coding base jansson tomcrypt include($$ROOT_DIR/common.pri)