summaryrefslogtreecommitdiff
path: root/RepositoryModule_host.mk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-04-10 19:02:44 -0400
committerPeter Foley <pefoley2@verizon.net>2013-04-11 19:00:12 -0400
commit0e5f2ea0de71439fe121da47deaba68585541808 (patch)
treef44a0d2e0a1f3a9e8e5cae3f8e2f916c546ed7fd /RepositoryModule_host.mk
parent6524435017f38759476970447007364e762134d0 (diff)
create --enable-mergelibs=all option
Support cramming everything into one big merged library as well as only the libraries depended upon by almost everything. Change-Id: I69647037dc62840294ba670d5d6c172a4608bf3f
Diffstat (limited to 'RepositoryModule_host.mk')
-rw-r--r--RepositoryModule_host.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index c67bd61f6577..f163ac27ca8e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -237,7 +237,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,ZLIB,zlib) \
))
-ifeq ($(MERGELIBS),TRUE)
+ifneq ($(MERGELIBS),)
$(eval $(call gb_Module_add_targets,libreoffice,\
Library_merged \
$(if $(URELIBS),Library_urelibs) \
@@ -267,7 +267,7 @@ $(eval $(call repositorymodule_serialize,\
sc msword swui sw sd \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
writerfilter cui chartcontroller oox \
- $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \
+ $(if $(MERGELIBS),merged,svxcore) \
xo vcl \
))
endif