summaryrefslogtreecommitdiff
path: root/redland
diff options
context:
space:
mode:
Diffstat (limited to 'redland')
-rw-r--r--redland/raptor/makefile.mk8
-rw-r--r--redland/rasqal/makefile.mk9
-rw-r--r--redland/redland/makefile.mk6
3 files changed, 9 insertions, 14 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 0229bf853e83..9d8dcf9f7219 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -167,6 +167,9 @@ CONFIGURE_ACTION=.$/configure
.IF "$(OS)"=="IOS"
CONFIGURE_ACTION+=LIBS=-liconv
+.ENDIF
+
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
CONFIGURE_FLAGS=--disable-shared
.ELSE
CONFIGURE_FLAGS=--disable-static
@@ -202,12 +205,9 @@ OUT2INC+=src$/raptor.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/libraptor-lo.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=src$/.libs$/libraptor.a
OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/libraptor.so
-OUT2BIN+=src/raptor-config
.ELIF "$(OS)"=="AIX"
OUT2LIB+=src$/.libs$/libraptor-lo.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
OUT2BIN+=src/raptor-config
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index fb0dce7f8271..1209c5af7117 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -86,7 +86,7 @@ rasqal_LDFLAGS+= -L$(ILIB:s/;/ -L/)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(rasqal_LDFLAGS)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --enable-shared --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(rasqal_LDFLAGS)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -139,7 +139,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-.IF "$(OS)"=="IOS"
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
CONFIGURE_FLAGS=--disable-shared
.ELSE
CONFIGURE_FLAGS=--disable-static
@@ -163,12 +163,9 @@ OUT2INC+=src$/rasqal.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/librasqal-lo.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=src$/.libs$/librasqal.a
OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/librasqal.so
-OUT2BIN+=src/rasqal-config
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=src$/.libs$/*.a
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 5bec90f25147..a62fefbff76a 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -144,7 +144,7 @@ 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"
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
CONFIGURE_FLAGS+= --disable-shared
.ELSE
CONFIGURE_FLAGS+= --disable-static
@@ -169,10 +169,8 @@ OUT2INC+=librdf$/*.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=librdf$/.libs$/librdf-lo.$(REDLAND_MAJOR).dylib
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=librdf$/.libs$/librdf.a
-.ELIF "$(OS)"=="ANDROID"
-OUT2LIB+=librdf$/.libs$/librdf.so
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=librdf$/.libs$/*.a