diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-08-02 07:10:30 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-08-02 12:21:54 +0200 |
| commit | 17145cbc02b372e5e13dfa4920c26c57509eea1e (patch) | |
| tree | 8e428e71f992be89624e2276191e9bcc72ffff2d | |
| parent | 88ddf1598bcd6aa923276c64b58b97c04ba94fda (diff) | |
Proper handling of system libvisio, wpd, wpg, wps
| -rw-r--r-- | RepositoryExternal.mk | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cf0e6a87e..2a66f730d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -441,7 +441,11 @@ endif # SYSTEM_OPENSSL ifeq ($(SYSTEM_LIBVISIO),YES) define gb_LinkTarget__use_visio -$(call gb_LinkTarget_add_libs,$(1),-llibvisio) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBVISIO_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS)) endef @@ -464,7 +468,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 +495,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 +522,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 |