diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-04-28 20:04:55 +0200 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-04-28 20:04:55 +0200 |
| commit | df90b5a1c9b602e524d0f92c7066c912f611b03b (patch) | |
| tree | 287df68a893b7f657cec9bee1147906a5c2b880b /solenv | |
| parent | 3393e04edd0f4f6baf5faeda2ed761332f45d9e5 (diff) | |
Revert "add additional modules to merged lib"
Breaks tinderbox build in cppumaker
This reverts commit 3393e04edd0f4f6baf5faeda2ed761332f45d9e5.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 307351d1b29f..cd2a0df01779 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -10,7 +10,6 @@ # we link all object files from these libraries into one, merged library MERGE_LIBRARY_LIST := \ - acc \ avmedia \ basegfx \ canvastools \ @@ -24,7 +23,6 @@ MERGE_LIBRARY_LIST := \ $(if $(USING_X11),desktop_detector) \ drawinglayer \ editeng \ - expwrap \ filterconfig \ fsstorage \ fwe \ @@ -45,7 +43,6 @@ MERGE_LIBRARY_LIST := \ sofficeapp \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ - store \ svl \ svt \ svx \ |