bridges/CustomTarget_gcc3_linux_arm.mk | 4 ++--
bridges/Library_gcc3_linux_arm.mk | 6 ++----
sdext/source/minimizer/impoptimizer.cxx | 3 ---
3 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 1c2285bb3628afd615fadbc2453db1cf51c102d7
Author: David Tardon <dtar...@redhat.com>
Date: Mon Sep 24 07:52:15 2012 +0200
another attempt to fix android ARM build
Change-Id: I36488341d84cb2db05ba564dafa65add79eff9da
diff --git a/bridges/CustomTarget_gcc3_linux_arm.mk
b/bridges/CustomTarget_gcc3_linux_arm.mk
index 85c5627..b36ac78 100644
--- a/bridges/CustomTarget_gcc3_linux_arm.mk
+++ b/bridges/CustomTarget_gcc3_linux_arm.mk
@@ -10,7 +10,6 @@
$(eval $(call
gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_linux_arm))
$(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm) : \
- $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \
$(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
$(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o
: \
@@ -19,7 +18,8 @@ $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhel
$(gb_CXX) -c -o $@ $< -fPIC
$(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
: \
+ $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \
| $(dir $(call
gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm)).dir
- echo $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o
> $@
+ echo $< > $@
# vim: set noet sw=4 ts=4:
diff --git a/bridges/Library_gcc3_linux_arm.mk
b/bridges/Library_gcc3_linux_arm.mk
index 507cfc3..c37275a 100644
--- a/bridges/Library_gcc3_linux_arm.mk
+++ b/bridges/Library_gcc3_linux_arm.mk
@@ -14,10 +14,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm
$(eval $(call gb_Library_Library,gcc3_uno))
-$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
- bridges/source/cpp_uno/gcc3_linux_arm \
-))
-
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
@@ -68,6 +64,8 @@ $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\
# HACK
$(call gb_LinkTarget_get_target,$(call
gb_Library_get_linktargetname,gcc3_uno)) : \
+ $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
+$(call gb_LinkTarget_get_target,$(call
gb_Library_get_linktargetname,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
# vim: set noet sw=4 ts=4:
commit 8e16b532dd7b2e5691357fd1cb9f72f449e14e58
Author: David Tardon <dtar...@redhat.com>
Date: Mon Sep 24 07:09:52 2012 +0200
drop unused headers
Change-Id: I4659664bd0c4172d2935c15ef2170715a3519b24
diff --git a/sdext/source/minimizer/impoptimizer.cxx
b/sdext/source/minimizer/impoptimizer.cxx
index bc40456..e988699 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -33,7 +33,6 @@
#include "pagecollector.hxx"
#include "informationdialog.hxx"
-#include <unotools/localfilehelper.hxx>
#include <vector>
#include "com/sun/star/util/URL.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
@@ -49,7 +48,6 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <unotools/configmgr.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
@@ -71,7 +69,6 @@
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
-#include <comphelper/componentcontext.hxx>
using namespace ::std;
using namespace ::rtl;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
