diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-28 00:08:18 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-28 00:08:18 +0200 |
| commit | ab594aaaa4403a0540f1f1be15797f01cfbc8f54 (patch) | |
| tree | 2c8942ed0f6490026ba3390f52af2a85df51cce3 | |
| parent | 8bee0e06b7b142b0cd3a01ebc13f499710ee6319 (diff) | |
RepositoryModule_ooo: add missing modules
Change-Id: I1c2702ccf7433eaec0403975d37f1dd35f63b260
| -rw-r--r-- | RepositoryModule_ooo.mk | 3 | ||||
| -rw-r--r-- | zlib/Module_zlib.mk | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 70eea4541a17..7c6da534fb37 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ embeddedobj \ embedserv \ eventattacher \ + $(call gb_Helper_optional,EXPAT,expat) \ extensions \ extras \ fileaccess \ @@ -154,6 +155,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ slideshow \ smoketest \ solenv \ + soltools \ sot \ starmath \ stoc \ @@ -200,6 +202,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ xmlscript \ xmlsecurity \ xsltml \ + $(call gb_Helper_optional,ZLIB,zlib) \ )) # vim: set noet ts=4 sw=4: diff --git a/zlib/Module_zlib.mk b/zlib/Module_zlib.mk index 446e07edc24c..bea7375ebf7f 100644 --- a/zlib/Module_zlib.mk +++ b/zlib/Module_zlib.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifneq ($(SYSTEM_ZLIB),YES) - $(eval $(call gb_Module_Module,zlib)) +ifeq ($(SYSTEM_ZLIB),NO) + $(eval $(call gb_Module_add_targets,zlib,\ ExternalPackage_zlib \ StaticLibrary_zlib \ |