icu/makefile.mk | 7 +++++++ icu/prj/d.lst | 6 ++++++ redland/prj/d.lst | 3 +++ redland/raptor/makefile.mk | 3 +++ redland/rasqal/makefile.mk | 3 +++ redland/redland/makefile.mk | 2 ++ store/prj/d.lst | 1 + 7 files changed, 25 insertions(+)
New commits: commit 4db5ea1ed7de742723dcf197434a5e22204d7dc9 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 10 02:10:59 2011 +0200 Deliver libstore.so for Android diff --git a/store/prj/d.lst b/store/prj/d.lst index e6bc5fd..edda6e9 100644 --- a/store/prj/d.lst +++ b/store/prj/d.lst @@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\store ..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib ..\%__SRC%\lib\libstore.*.* %_DEST%\lib\* +..\%__SRC%\lib\libstore.so %_DEST%\lib\libstore.so ..\%__SRC%\lib\libstore.a %_DEST%\lib\libstore.a ..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll commit 0013537709f1b79d0ca16863033bbecae23114ab Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 10 02:08:25 2011 +0200 Deliver shared library file names ending in .so for Android diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 20bae4d..5715417 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 6ddeef1..be863e7 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 dbad2d2..71bee48 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 ea67d09..6113531 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 commit e0183772e5821fcf05023eb5d510732a879c2869 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 10 01:46:19 2011 +0200 Deliver just shared library file names ending in .so for Android diff --git a/icu/makefile.mk b/icu/makefile.mk index c1b7a0b..4db60c0 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -152,6 +152,13 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicui18n.a \ $(BUILD_DIR)$/lib$/libicule.a \ $(BUILD_DIR)$/lib$/libicutu.a +.ELIF "$(OS)"=="ANDROID" +OUT2LIB= \ + $(BUILD_DIR)$/lib$/libicudata.so \ + $(BUILD_DIR)$/lib$/libicuuc.so \ + $(BUILD_DIR)$/lib$/libicui18n.so \ + $(BUILD_DIR)$/lib$/libicule.so \ + $(BUILD_DIR)$/lib$/libicutu.so .ELSE OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 859a504..3ae4de0 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -25,6 +25,12 @@ mkdir: %_DEST%\inc\external\unicode ..\%__SRC%\lib\libicuuc.*.*.* %_DEST%\lib\ ..\%__SRC%\lib\libicutu.*.*.* %_DEST%\lib\ +..\%__SRC%\lib\libicudata.so %_DEST%\lib\ +..\%__SRC%\lib\libicui18n.so %_DEST%\lib\ +..\%__SRC%\lib\libicule.so %_DEST%\lib\ +..\%__SRC%\lib\libicuuc.so %_DEST%\lib\ +..\%__SRC%\lib\libicutu.so %_DEST%\lib\ + ..\%__SRC%\lib\libicudata.a %_DEST%\lib\ ..\%__SRC%\lib\libicui18n.a %_DEST%\lib\ ..\%__SRC%\lib\libicule.a %_DEST%\lib\ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits