From bdd03eb3292cf2c9d78bb69c647dc601d229d137 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Tue, 2 Aug 2011 07:10:30 +0200 Subject: [PATCH 1/2] Proper handling of system wpd, wpg, wps --- RepositoryExternal.mk | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cf0e6a8..74dfce3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -464,7 +464,11 @@ endif # SYSTEM_LIBVISIO ifeq ($(SYSTEM_LIBWPD),YES) define gb_LinkTarget__use_wpd -$(call gb_LinkTarget_add_libs,$(1),-llibwpd) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBWPD_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS)) endef @@ -487,7 +491,11 @@ endif # SYSTEM_LIBWPD ifeq ($(SYSTEM_LIBWPG),YES) define gb_LinkTarget__use_wpg -$(call gb_LinkTarget_add_libs,$(1),-llibwpg) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBWPG_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS)) endef @@ -510,7 +518,11 @@ endif # SYSTEM_LIBWPG ifeq ($(SYSTEM_LIBWPS),YES) define gb_LinkTarget__use_wps -$(call gb_LinkTarget_add_libs,$(1),-llibwps) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBWPS_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS)) endef -- 1.7.2.5