summaryrefslogtreecommitdiff
path: root/redland
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-09-28 12:40:37 +0200
committerThorsten Behrens <tbehrens@novell.com>2011-09-28 16:47:49 +0200
commitf0149fe6eaa5e8ac121af39354950c73534482a3 (patch)
tree5a077e50ab6344580d0d26e908e5d968c9c701af /redland
parent69a1f550625b967c34a1468c7e83e22003bb0796 (diff)
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.
Diffstat (limited to 'redland')
-rw-r--r--redland/redland/makefile.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index b38c45a6e7d1..ea67d0964977 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