diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-13 21:34:13 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:19:58 +0200 |
| commit | 5f2a2e2149f26db39efd3e7f2fdca952cfcf65f5 (patch) | |
| tree | 4b49988e22c9a14aa4b497cea4b7773552e33ff9 | |
| parent | 901b5572b1c03fcb52d0b808e0a1710c2bd51c42 (diff) | |
Don't bother with a separate libsal_textenc when merging libs
| -rw-r--r-- | android/qa/sc/Makefile | 1 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 17 | ||||
| -rw-r--r-- | sal/Module_sal.mk | 3 | ||||
| -rw-r--r-- | sal/textenc/textenc.cxx | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 6899483ce277..22318f0f7760 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -91,7 +91,6 @@ copy-stuff: ooxlo \ reflection.uno \ reg \ - sal_textenc \ saxlo \ sclo \ scfiltlo \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index cbdbc82c6477..13a514f33f7c 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -132,6 +132,23 @@ $(eval $(call gb_Library_add_cobjects,sal,\ sal/osl/all/filepath \ )) +ifeq ($(MERGELIBS),TRUE) +$(eval $(call gb_Library_add_exception_objects,sal,\ + sal/textenc/context \ + sal/textenc/convertbig5hkscs \ + sal/textenc/converteuctw \ + sal/textenc/convertgb18030 \ + sal/textenc/convertiso2022cn \ + sal/textenc/convertiso2022jp \ + sal/textenc/convertiso2022kr \ + sal/textenc/convertsinglebytetobmpunicode \ + sal/textenc/tables \ + sal/textenc/tcvtbyte \ + sal/textenc/tcvtmb \ + sal/textenc/tcvtutf7 \ +)) +endif + ifeq ($(GUI),UNX) $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/conditn \ diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 42a2124cd4bc..7a3304a220dd 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,sal,\ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ - Library_sal_textenc \ + $(if $(filter TRUE,$(MERGELIBS)),, \ + Library_sal_textenc) \ $(if $(filter $(OS),WNT), \ Library_uwinapi) \ Package_inc \ diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 8d34920b7e82..b6684928998d 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData namespace { -#if defined IOS +#if defined IOS || defined LIBO_MERGELIBS extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( rtl_TextEncoding); // from tables.cxx in sal_textenc library |