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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 4bbb22ec59ed..a799aaacc364 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -179,20 +179,21 @@ gb_MERGEDLIBS := \ xstor \ $(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS)) +ifneq (,$(URELIBS)) gb_URELIBS := \ + cppu \ + cppuhelper \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ + purpenvhelper \ reg \ + sal \ + salhelper \ store \ unoidl \ - xmlreader \ - $(if $(filter ALL,$(MERGELIBS)), \ - cppu \ - cppuhelper \ - purpenvhelper \ - sal \ - salhelper \ - ) + xmlreader + +endif endif |