diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-03 15:06:52 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-13 17:00:23 +0100 |
| commit | bd030305b844f451910d671c894d5e8fa8d532b7 (patch) | |
| tree | 4214b01121a25d3ab0b58af72515febfe0eefa71 | |
| parent | b6bb9bd1e83b40f14f74f3dcf345c7480ac64c46 (diff) | |
add libexttextcat to external libs
| -rw-r--r-- | RepositoryExternal.mk | 39 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 264cc1134c2d..11896cd801d8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -209,6 +209,45 @@ endef endif # SYSTEM_HUNSPELL +ifeq ($(SYSTEM_LIBEXTTEXTCAT),YES) + +define gb_LinkTarget__use_libexttextcat +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBEXTTEXTCAT_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LIBEXTTEXTCAT_LIBS)) + +endef + +else # !SYSTEM_LIBEXTTEXTCAT + +ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ + exttextcat \ +)) +else +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + exttextcat \ +)) +endif + +define gb_LinkTarget__use_libexttextcat +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_linked_libs,$(1),\ + exttextcat \ +) +else +$(call gb_LinkTarget_add_linked_static_libs,$(1),\ + exttextcat \ +) +endif + +endef + +endif # SYSTEM_LIBEXTTEXTCAT + + ifeq ($(SYSTEM_LIBXML),YES) define gb_LinkTarget__use_libxml2 diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 6b2d230addec..59dd09db0b0b 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -49,6 +49,7 @@ gb_Library_DLLFILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_DLLF gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) +gb_Library_FILENAMES := $(patsubst exttextcat:libexttextcat%,exttextcat:libilibexttextcat%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) |