diff options
| author | Arjun <pikabell70@gmail.com> | 2022-01-23 16:14:07 +0530 |
|---|---|---|
| committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2022-01-23 17:54:44 +0100 |
| commit | 1cc2690fe2f87e8acce4e9b4e0cb533fda26e295 (patch) | |
| tree | 1003854a6bbe2acde4e0d9590768df24668eea42 /solenv/gbuild/extensions | |
| parent | fb1e658bbdc2e6f9d316fdf9a1d08b414d72c9a7 (diff) | |
tdf#97046 prefix gb_ to system variables
Change-Id: I8be2f55e3306d7ac34ea5819ab93fd537315b281
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128804
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index d5bf6f9c0862..693d3bde824d 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -8,7 +8,7 @@ # # we link all object files from these libraries into one, merged library -MERGE_LIBRARY_LIST := \ +gb_MERGE_LIBRARY_LIST := \ avmedia \ $(if $(filter WNT,$(OS)),avmediawin) \ $(call gb_Helper_optional,SCRIPTING, \ @@ -112,13 +112,13 @@ MERGE_LIBRARY_LIST := \ # allow module-deps.pl to color based on this. ifneq ($(ENABLE_PRINT_DEPS),) -$(info MergeLibContents: $(MERGE_LIBRARY_LIST)) +$(info MergeLibContents: $(gb_MERGE_LIBRARY_LIST)) endif ifneq ($(MERGELIBS),) -gb_MERGEDLIBS := $(MERGE_LIBRARY_LIST) +gb_MERGEDLIBS := $(gb_MERGE_LIBRARY_LIST) endif |