[Libreoffice-commits] .: accessibility/bridge accessibility/Jar_accessibility.mk
Peter Foley
pefoley2 at kemper.freedesktop.org
Sat Dec 24 07:37:48 PST 2011
accessibility/Jar_accessibility.mk | 2 +-
accessibility/bridge/source/java/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c61d62d70a794c7736521693aa02c01db1300a27
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Dec 24 10:32:03 2011 -0500
fix gbuildified accessibilty on windows
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index 2eb0f72..bc68709 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -90,6 +90,6 @@ $(eval $(call gb_Jar_add_generated_sourcefiles,java_accessibility,\
# Dummy dep. to satisfy make's depsolver: .../classes is created by a
# custom target, so there is no dependency information for it here.
# It also makes sure that the package is built before this jar .-)
-$(call gb_Jar_get_target,java_accessibility) :| $(call gb_Package_get_target,accessibility_bridge)
+$(WORKDIR)/CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build.java :| $(call gb_Package_get_target,accessibility_bridge)
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/bridge/source/java/Makefile b/accessibility/bridge/source/java/Makefile
index e582dc3..b9d9e33 100644
--- a/accessibility/bridge/source/java/Makefile
+++ b/accessibility/bridge/source/java/Makefile
@@ -33,7 +33,7 @@ TARGETDIR := $(WORKDIR)/CustomTarget/accessibility/bridge/inc
$(TARGETDIR)/WindowsAccessBridgeAdapter.h :
mkdir -p $(dir $@) && \
cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
- javah -classpath . -o $@ org.openoffice.accessibility.WindowsAccessBridgeAdapter
+ javah -classpath . -o $(call gb_Helper_convert_native,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
.DEFAULT_GOAL := all
.PHONY : all
More information about the Libreoffice-commits
mailing list