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 /sal/Module_sal.mk | |
| parent | 901b5572b1c03fcb52d0b808e0a1710c2bd51c42 (diff) | |
Don't bother with a separate libsal_textenc when merging libs
Diffstat (limited to 'sal/Module_sal.mk')
| -rw-r--r-- | sal/Module_sal.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 \ |