diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 12:58:47 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 16:39:42 +0200 |
| commit | cefeae773f0644adbb22b131ff9e519baf058828 (patch) | |
| tree | 5273971f33efa7fdc70789f7460e12308102023f /desktop | |
| parent | bf063d9dfab7ca16b1b7dff54ec9b1d47c24b997 (diff) | |
Revert "do not merge public ure libraries"
Does not work because cppuhelper depends on private libraries.
So, either by setting URELIBS we break API or can't merge that much or
need to think about it more and implement something clever.
This reverts commit 75ece7acdc81d17ce26bab966e57fbca7406bf52.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Pagein_common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index d6ec2f935783..f13ac72675a9 100644 --- a/desktop/Pagein_common.mk +++ b/desktop/Pagein_common.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Pagein_Pagein,common)) # sorted in approx. reverse load order (ld.so.1) $(eval $(call gb_Pagein_add_objects,common,\ $(if $(MERGELIBS),merged) \ - $(if $(MERGELIBS),urelibs) \ + $(if $(URELIBS),urelibs) \ i18nlangtag \ $(if $(findstring YES,$(SYSTEM_ICU)),,\ icui18n \ |