android/Bootstrap/Makefile.shared | 4 ++--
android/experimental/DocumentLoader/Makefile | 6 +++---
android/experimental/LibreOffice4Android/Makefile | 6 +++---
android/experimental/desktop/Makefile | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 555168bd6be37cb811276fb235bcdfc01a2c731e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Oct 26 08:46:23 2013 +0200
android: fix/remove last uses of $(OUTDIR) here
Change-Id: Iba4db538fea3ab494af737c91f5fd754de0c044c
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 5906fa6..20d1c0c 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -116,9 +116,9 @@ WHOLELIBS = \
-Wl,--no-whole-archive
-$(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a)
native-code.cxx dummies.cxx
+$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
native-code.cxx dummies.cxx -L$(OUTDIR)/lib -L$(INSTDIR)/$(LIBO_LIB_FOLDER)
$(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
+ $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS)
$(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 1aa743b..49b2895 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -23,9 +23,9 @@ copy-stuff:
# extent).
#
mkdir -p assets/gz.unpack/program/ure assets/lib
assets/program/services assets/ure/share/misc
assets/ComponentTarget/i18npool/util
- gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb
>assets/gz.unpack/program/offapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb
>assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
# So just hardcode the known APP_DATA_PATH for now...
for F in program/services/services ure/share/misc/services; do \
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index e15d30b..9f8dcce 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -24,9 +24,9 @@ copy-stuff:
# extent).
#
mkdir -p assets/gz.unpack/program/ure assets/lib
assets/program/services assets/ure/share/misc
assets/ComponentTarget/i18npool/util
- gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb
>assets/gz.unpack/program/offapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb
>assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
for F in program/services/services ure/share/misc/services; do \
sed -e
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g'
<$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index 7a00e7e..bd75e51 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -24,9 +24,9 @@ copy-stuff:
# the .apk and/or unpacked at install time might be unnecessary.
#
mkdir -p assets/gz.unpack/program/ure assets/lib
assets/program/services assets/ure/share/misc
assets/ComponentTarget/i18npool/util
- gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb
>assets/gz.unpack/program/offapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb
>assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
# So just hardcode the known APP_DATA_PATH for now...
for F in program/services/services ure/share/misc/services; do \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
