diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-04 18:24:08 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-09-07 13:41:35 +0000 |
| commit | 1502e969f5e79e8c9594f617626e999c971b7ef2 (patch) | |
| tree | 223bffaa383970530d26fd18ad2956b606855485 /solenv/gbuild | |
| parent | 984df756592c4cf2f784fda1d0cbdf8e5c7ef64c (diff) | |
module-deps now distinguishes merged-libs in its output.
Change-Id: Icc3a965e59f5b2d4e23e0e5a4d0400b6b175c9c1
Reviewed-on: https://gerrit.libreoffice.org/18346
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 1ca047fc6f6c..b9b8d75bb52d 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -8,10 +8,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifneq ($(MERGELIBS),) - # we link all object files from these libraries into one, merged library -gb_MERGEDLIBS := \ +MERGE_LIBRARY_LIST := \ avmedia \ $(if $(filter $(OS),ANDROID),,basebmp) \ basegfx \ @@ -62,6 +60,18 @@ gb_MERGEDLIBS := \ xo \ xstor \ + +# allow module-deps.pl to color based on this. +ifneq ($(ENABLE_PRINT_DEPS),) + +$(info MergeLibContents: $(MERGE_LIBRARY_LIST)) + +endif + +ifneq ($(MERGELIBS),) + +gb_MERGEDLIBS := $(MERGE_LIBRARY_LIST) + endif # vim: set noet sw=4 ts=4: |