[Libreoffice-commits] .: 2 commits - Module_tail_build.mk tail_build/prj

[Libreoffice Gerrit user]

 Module_tail_build.mk     |    2 ++
 tail_build/prj/build.lst |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 43a9cd8a9c6fe9db2f899cf35095baf6f559c6b2
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Dec 25 09:53:31 2012 -0500

    add libpng to tail_build
    
    Change-Id: Icac37cd3e82c5dd4bb6339c57e70f47054a17c12

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 6bd6539..b8c21ac 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
+	$(call gb_Helper_optional,LIBPNG,libpng) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	librelogo \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index bc769be..19db532 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf external solenv soltools NULL
+tb      tail_build : EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 01c7923d726c842cbd30daaeb1bccc985f10c240
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Dec 25 09:50:19 2012 -0500

    add zlib to tail_build
    
    Change-Id: If891480564760044ad0af792f8c21a8ca1a06580

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 34569d1..6bd6539 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -203,6 +203,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	xmlscript \
 	xmlsecurity \
 	$(call gb_Helper_optional,XSLTML,xsltml) \
+	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 ifeq ($(MERGELIBS),TRUE)
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 1adb285..bc769be 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL