diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 00:40:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 12:02:38 +0000 |
commit | 80b0a3a7b647b3d60379344a37a5f9b15a2bbfe9 (patch) | |
tree | f417692b42e7caa5a2834eccc8038b35f79df0e4 /solenv | |
parent | 18a48b7489650c7addef4c64b7c5b6985a3c68fe (diff) |
fold i18npaper into i18nutil
It's too small to justify standalone existence.
We can accumulate i18n things we link to directly into
i18nutil and rework i18npool uno implementions in terms
of thin wrappers over i18nutil and prefer linking to
i18nutil internally and leave the uno forwarders for
use by external components and scripting
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/inc/libs.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 0e164f40725c..55bf2bfd5a6e 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -69,7 +69,6 @@ ICUDATALIB=-licudata .ENDIF I18NUTILLIB=-li18nutil$(COMID) I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) -I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX) SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION) XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) @@ -359,7 +358,7 @@ UNOTOOLSLIB+=$(UCBHELPERLIB) TOOLSLIB+=$(BASEGFXLIB) TOOLSLIB+=$(ZLIB3RDLIB) -VCLLIB+=$(ICUUCLIB) $(I18NPAPERLIB) +VCLLIB+=$(ICUUCLIB) .ENDIF @@ -385,7 +384,6 @@ ICUUCLIB=icuuc.lib ICUDATALIB=icudt.lib I18NUTILLIB=ii18nutil.lib I18NISOLANGLIB=ii18nisolang.lib -I18NPAPERLIB=ii18npaper.lib I18NREGEXPLIB=ii18nregexp.lib SALHELPERLIB=isalhelper.lib XMLSCRIPTLIB=ixcr.lib |