[Libreoffice-commits] .: 4 commits - ios/prj Module_tail_build.mk nss/prj openldap/prj RepositoryModule_ooo.mk tail_build/prj

[Libreoffice Gerrit user]

 Module_tail_build.mk     |    4 ----
 RepositoryModule_ooo.mk  |    1 +
 ios/prj/build.lst        |    2 +-
 nss/prj/build.lst        |    2 +-
 openldap/prj/d.lst       |    5 -----
 tail_build/prj/build.lst |    2 +-
 6 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit bd2de1201f0a745cbd8a962f957a7f2c8a219c88
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Jan 7 20:51:44 2013 +0100

    openldap: clear d.lst
    
    Change-Id: I197d03e55cd5c996ca85d4a31f1907722de2fa20

diff --git a/openldap/prj/d.lst b/openldap/prj/d.lst
index ff6eaff..e69de29 100644
--- a/openldap/prj/d.lst
+++ b/openldap/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\openldap
-..\%__SRC%\inc\*.h %_DEST%\inc\openldap\*.h
-..\%__SRC%\lib\libldap.a %_DEST%\lib\libldap.a
-..\%__SRC%\lib\libldap_r.a %_DEST%\lib\libldap_r.a
-..\%__SRC%\lib\liblber.a %_DEST%\lib\liblber.a
commit 2baa4b333fe3046f106e114a01dfe0411a6cc6f0
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Jan 7 20:19:58 2013 +0100

    nss: depend on python3
    
    nss is not in tail_build because of moz, so expat, external, openssl and
    python3 must go also out.
    
    Change-Id: I52a3b02ff477ae52abc298d96770755ebc392d57

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 0407aae..dfac982 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -70,9 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	embedserv \
 	$(call gb_Helper_optional,EPM,epm) \
 	eventattacher \
-	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
-	external \
 	extras \
 	fileaccess \
 	filter \
@@ -134,13 +132,11 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	oovbaapi \
 	oox \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
-	$(call gb_Helper_optional,OPENSSL,openssl) \
 	package \
 	padmin \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	psprint_config \
 	$(call gb_Helper_optional,PYUNO,pyuno) \
-	$(call gb_Helper_optional,PYTHON,python3) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
 	readlicense_oo \
 	$(call gb_Helper_optional,REDLAND,redland) \
diff --git a/nss/prj/build.lst b/nss/prj/build.lst
index 9c4caa1..b5f776f 100644
--- a/nss/prj/build.lst
+++ b/nss/prj/build.lst
@@ -1,2 +1,2 @@
-ns	nss	: solenv soltools NULL
+ns	nss	: solenv soltools PYTHON:python3 NULL
 ns	nss\prj						nmake	-	all	ns_nss NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 0b03bb2..5d13406 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss XPDF:xpdf solenv soltools NULL
+tb      tail_build : EXPAT:expat LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit ea96f22f2d1218111c47f5ac9a12f8d5a32f6d6c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Jan 7 20:17:43 2013 +0100

    RepositoryModule_ooo.mk: add android
    
    Change-Id: I8d75da8c28b5b1386b860b2d8bde5f386ad1f928

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index ff6c730..f2bde73 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 	accessibility \
 	$(call gb_Helper_optional,AFMS,afms) \
+	android \
 	animations \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	apple_remote \
commit 67cb70c80d5665270d7814420b51556ff0787b8d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Jan 7 20:16:20 2013 +0100

    module packimages is gone
    
    Change-Id: I4a6c6b8680f0cbd9a64442b8e57bb229fc2b6e4d

diff --git a/ios/prj/build.lst b/ios/prj/build.lst
index dcd87cc..d067f9c 100644
--- a/ios/prj/build.lst
+++ b/ios/prj/build.lst
@@ -1,2 +1,2 @@
-ios ios :: packimages postprocess NULL
+ios ios :: postprocess NULL
 ios ios\prj nmake - all an_prj NULL