[Libreoffice-commits] .: RepositoryExternal.mk RepositoryFixes.mk

[Matus Kukan]

 RepositoryExternal.mk |    4 ++--
 RepositoryFixes.mk    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4258f0260d6e99edf5db44720b85db9f1d78ca91
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Dec 23 13:26:56 2011 +0100

    Repository: fix Windows name for internal libexttextcat

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 11896cd..6b9ebc0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -224,7 +224,7 @@ else # !SYSTEM_LIBEXTTEXTCAT
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	exttextcat \
+	libexttextcat \
 ))
 else
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
@@ -235,7 +235,7 @@ endif
 define gb_LinkTarget__use_libexttextcat
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	exttextcat \
+	libexttextcat \
 )
 else
 $(call gb_LinkTarget_add_linked_static_libs,$(1),\
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index ff1eb34..cb80f45 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -56,7 +56,6 @@ gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$
 gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(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))
@@ -68,6 +67,7 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl
 ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))