diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-14 11:17:30 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-17 06:26:29 +0000 |
| commit | 85d1e39d742d7798369b0071f9a5de5f62810d39 (patch) | |
| tree | 2cefa2cedd017918c31c3a132c5026e0e69e1428 /RepositoryExternal.mk | |
| parent | 42aec34a5d83d863e050da85f88b31417c44b698 (diff) | |
gbuild: Fix and check package dependencies.
Change-Id: Ia54def7a404e07974eb1e8a556f4659cd974e7f8
Reviewed-on: https://gerrit.libreoffice.org/7081
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b44927e9a944..3d9a4bf967b9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -399,9 +399,6 @@ $(call gb_LinkTarget_set_include,$(1),\ ) ifeq ($(COM),MSC) -$(call gb_LinkTarget_use_package,$(1),\ - mythes \ -) $(call gb_LinkTarget_use_static_libraries,$(1),\ mythes \ ) @@ -997,14 +994,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ endif define gb_LinkTarget__use_librdf -$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) - ifeq ($(COM),MSC) $(call gb_LinkTarget_use_libraries,$(1),\ raptor2 \ rdf \ ) else +$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) + $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \ -L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \ |