diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 17:34:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-10 22:52:56 +0200 |
| commit | 3fdb77f0827d374a7fa2f1e232920b6174d6b44b (patch) | |
| tree | b97e714c5940ea712d29a80943f69394af288b78 /solenv/gbuild/extensions | |
| parent | 2c8cc6e5c600d04ae545af9f9223b88c3a757eee (diff) | |
add new urelibs library merging some libraries from ure/lib/
There is no configure switch for this, URELIBS must be set.
This commit changes strategy to link also libraries being merged.
We need them for build tools like idlc, cppumaker, .., so the tools can
link against them now. This avoids circular dependencies.
Change-Id: Ic49e18ecbeaff84d4f5a7fafe8b1fbf45ed18c9b
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 194c93ce25af..28558fb1f531 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -143,6 +143,21 @@ gb_MERGEDLIBS := \ xo \ xstor \ +ifneq (,$(URELIBS)) +gb_URELIBS := \ + cppu \ + cppuhelper \ + $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ + $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ + reg \ + sal \ + salhelper \ + store \ + unoidl \ + xmlreader \ + +endif + endif # vim: set noet sw=4 ts=4: |