Module_tail_build.mk | 3 ++-
RepositoryModule_ooo.mk | 3 +++
languagetool/ExternalProject_languagetool.mk | 2 +-
postprocess/prj/build.lst | 2 +-
zlib/Module_zlib.mk | 4 ++--
5 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 72258d123467979ea7c4f1ecc029e6fb78907fad
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Oct 28 00:39:39 2012 +0200
add languagetool to tail_build
Change-Id: Id42c86bc5e6deaaa3215beefcf06474b5049e6e3
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 230d973..1fb20d2 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
jurt \
jvmaccess \
jvmfwk \
+ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
libcdr \
libcmis \
libmspub \
diff --git a/languagetool/ExternalProject_languagetool.mk
b/languagetool/ExternalProject_languagetool.mk
index 4934dad..363fde5 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -15,7 +15,7 @@ $(eval $(call
gb_ExternalProject_register_targets,languagetool,\
build \
))
-$(call gb_ExternalProject_get_state_target,languagetool,build) :
+$(call gb_ExternalProject_get_state_target,languagetool,build) : $(call
gb_Jar_get_outdir_target,juh)
cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
$(ICECREAM_RUN) "$(ANT)" \
-q \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index b445daa..3247ce9 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep EPM:epm
HELP:helpcontent2 ODK:odk LANGUAGETOOL:languagetool MYSQLC:mysqlc
DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep EPM:epm
HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport
sysui tail_build NULL
po postprocess usr1 - all
po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig
po_checkxml NULL
commit b76bca11b1012253db4fb63aefb8423ad30b84f3
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Oct 28 00:13:29 2012 +0200
fix x11_extensions delivering
Change-Id: Ib9de68943db9a29f2cd00d1388e473b242a2a866
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index b01f32c..230d973 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -182,7 +182,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
wizards \
writerfilter \
writerperfect \
- $(call gb_Helper_optional,EXTENSIONS,x11_extensions) \
+ $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \
xmerge \
$(call gb_Helper_optional,DESKTOP,xmlhelp) \
xmloff \
commit ab594aaaa4403a0540f1f1be15797f01cfbc8f54
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Oct 28 00:08:18 2012 +0200
RepositoryModule_ooo: add missing modules
Change-Id: I1c2702ccf7433eaec0403975d37f1dd35f63b260
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 70eea45..7c6da53 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 446e07e..bea7375 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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
