diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 11:47:34 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 11:50:25 +0200 |
| commit | 75ece7acdc81d17ce26bab966e57fbca7406bf52 (patch) | |
| tree | 49c858afa1cba594421ab923278f2a508f7283c1 /solenv | |
| parent | fdb6b39d682372ece754afee2d574ab31552f36b (diff) | |
do not merge public ure libraries
No more need for URELIBS, depend only on MERGELIBS.
Change-Id: I5a93031116c26bbbe375e9c467e7b427487ec18b
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index a799aaacc364..4bbb22ec59ed 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -179,21 +179,20 @@ 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 - -endif + xmlreader \ + $(if $(filter ALL,$(MERGELIBS)), \ + cppu \ + cppuhelper \ + purpenvhelper \ + sal \ + salhelper \ + ) endif |