From 0013537709f1b79d0ca16863033bbecae23114ab Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 10 Nov 2011 02:08:25 +0200 Subject: Deliver shared library file names ending in .so for Android --- redland/prj/d.lst | 3 +++ redland/raptor/makefile.mk | 3 +++ redland/rasqal/makefile.mk | 3 +++ redland/redland/makefile.mk | 2 ++ 4 files changed, 11 insertions(+) (limited to 'redland') diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 20bae4d8cc93..5715417f7a1e 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -2,14 +2,17 @@ mkdir: %_DEST%\inc\external ..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h ..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1 symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so +..\%__SRC%\lib\libraptor.so %_DEST%\lib\libraptor.so ..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib ..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1 symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so +..\%__SRC%\lib\librasqal.so %_DEST%\lib\librasqal.so ..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib ..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0 symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so +..\%__SRC%\lib\librdf.so %_DEST%\lib\librdf.so ..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 6ddeef1915b0..be863e7aab87 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -172,6 +172,9 @@ OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="IOS" 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.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index dbad2d2b4c3c..71bee48d72fa 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -147,6 +147,9 @@ OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="IOS" 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 ea67d0964977..6113531a83d4 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -152,6 +152,8 @@ OUT2INC+=librdf$/*.h OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib .ELIF "$(OS)"=="IOS" OUT2LIB+=librdf$/.libs$/librdf.a +.ELIF "$(OS)"=="ANDROID" +OUT2LIB+=librdf$/.libs$/librdf.so .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=librdf$/.libs$/*.a -- cgit