diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-30 23:26:59 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-07 09:10:35 -0400 |
| commit | 31f589b03a3ed9a60e3548e821c2ea1ebe1b7f76 (patch) | |
| tree | 6d17f7af5eb5ff8be7d876acfca797f70636fbc3 /RepositoryExternal.mk | |
| parent | a6639312005763d19e877bc61e6a844c09f5fb23 (diff) | |
Get internal liborcus to build.
Change-Id: Ie08f8b608c5b71e5375793e6cf9054ea75d7732d
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6cecad6c665a..d7d4a189f95e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1856,31 +1856,28 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ endif # SYSTEM_PYTHON -ifeq ($(SYSTEM_ORCUS),YES) +ifeq ($(SYSTEM_LIBORCUS),YES) define gb_LinkTarget__use_orcus $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(ORCUS_CFLAGS) \ + $(LIBORCUS_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(LIBORCUS_LIBS)) endef -else # !SYSTEM_ORCUS - -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - orcuslib \ -)) +else # !SYSTEM_LIBORCUS define gb_LinkTarget__use_orcus -$(call gb_LinkTarget_use_static_libraries,$(1),\ - orcuslib \ + +$(call gb_LinkTarget_add_libs,$(1),\ + -lorcus-0.2 \ ) endef -endif # SYSTEM_ORCUS +endif # SYSTEM_LIBORCUS # MacOSX-only frameworks ############################################ # (in alphabetical order) |