[Libreoffice-commits] .: desktop/Module_desktop.mk postprocess/packcomponents postprocess/packregistry redland/redland RepositoryFixes.mk tail_build/prj

[Thorsten Behrens]

 RepositoryFixes.mk                     |   11 -----------
 desktop/Module_desktop.mk              |   10 +++++-----
 postprocess/packcomponents/makefile.mk |    4 ++--
 postprocess/packregistry/makefile.mk   |    2 ++
 redland/redland/makefile.mk            |    9 ++++++---
 tail_build/prj/build.lst               |    2 +-
 6 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit f0149fe6eaa5e8ac121af39354950c73534482a3
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Sep 28 12:40:37 2011 +0200

    Android now builds up to instsetoo_native
    
    Last fixes - remove kludge from RepositoryFixes.mk, have redland
    build w/o threads for the while, and some hackery to exclude
    pointless code like oosplash from android build.

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 16f1c8f..959fa61 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -125,15 +125,4 @@ endif # ifeq ($(COM),GCC)
 
 endif # ifeq ($(OS),WNT)
 
-# Some external libraries get built as static libraries for Android
-# because we haven't bothered fixing their configury to recognize that
-# shared libraries can be built for the platform.
-ifeq ($(OS),ANDROID)
-gb_Library_FILENAMES := $(patsubst cppunit:%.so,cppunit:%.a,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xml2:%.so,xml2:%.a,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst rdf:%.so,rdf:%.a,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xslt:%.so,xslt:%.a,$(gb_Library_FILENAMES))
-
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 84df7dd..2b137f6 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -92,14 +92,16 @@ $(eval $(call gb_Module_add_targets,desktop,\
     WinResTarget_swriter \
 ))
 
-else
-
-ifeq ($(OS),MACOSX)
+else ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Module_add_targets,desktop,\
     Executable_officeloader \
 ))
 
+else ifeq ($(OS),ANDROID)
+
+else ifeq ($(OS),IOS)
+
 else
 
 $(eval $(call gb_Module_add_targets,desktop,\
@@ -109,6 +111,4 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 endif
 
-endif
-
 # vim: set ts=4 sw=4 et:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 8f23fc4..8c5a214 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -197,7 +197,7 @@ my_components += \
 my_components += pythonloader
 .ENDIF
 
-.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS"
+.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID"
 my_components += component/desktop/unx/splash/splash
 .ENDIF
     
@@ -316,7 +316,7 @@ my_components += \
     component/vcl/vcl.windows
 .END
 
-.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS"
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID"
 my_components += \
     desktopbe1 \
     component/vcl/vcl.unx
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index b77b968..f03a640 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -315,6 +315,8 @@ MY_FILES_main += \
         # Inet-wnt.xcu must come after Inet.xcu
 .ELIF "$(GUIBASE)" == "cocoatouch"
 # ?
+.ELIF "$(GUIBASE)" == "android"
+# ?
 .ELSE
 ERROR : unknown-GUIBASE
 .END
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index b38c45a..ea67d09 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -128,12 +128,15 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+CONFIGURE_FLAGS=--disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 .IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
+CONFIGURE_FLAGS+= --disable-shared
 .ELSE
-CONFIGURE_FLAGS=--disable-static
+CONFIGURE_FLAGS+= --disable-static
+.ENDIF
+.IF "$(OS)"!="ANDROID"
+CONFIGURE_FLAGS+= --with-threads
 .ENDIF
-CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index f2d4019..8585462 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript NULL
 tb tail_build\prj nmake - all tb_prj   NULL