javaunohelper/cppumaker/Makefile | 3 ++- jvmfwk/Library_jvmfwk.mk | 2 +- jvmfwk/Library_sunjavaplugin.mk | 2 +- jvmfwk/plugins/sunmajor/pluginlib/Makefile | 3 ++- ridljar/javamaker/Makefile | 3 ++- unoil/javamaker/Makefile | 3 ++- 6 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit 980e69cd61b41a644de0736ee7b70c84f5b9e013 Author: Matus Kukan <matus.ku...@gmail.com> Date: Wed Feb 15 23:26:40 2012 +0100 add gb_Helper_abbreviate_dirs_native diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile index 230daa0..017acf1 100644 --- a/javaunohelper/cppumaker/Makefile +++ b/javaunohelper/cppumaker/Makefile @@ -29,6 +29,7 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : + $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,cppumaker -C -BUCR -O. \ -Tcom.sun.star.beans.NamedValue \ -Tcom.sun.star.beans.XPropertySet \ @@ -51,7 +52,7 @@ done : -Tcom.sun.star.uno.XComponentContext \ -Tcom.sun.star.uno.XWeak \ $(OUTDIR)/bin/udkapi.rdb) && \ - touch $@ + touch $@) .DEFAULT_GOAL := all .PHONY : all diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile index 2e91b1d..b190038 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/Makefile +++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile @@ -28,7 +28,8 @@ include $(GBUILDDIR)/gbuild.mk JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java - $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^ + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) .DEFAULT_GOAL := all .PHONY : all diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile index 65c106b..d2fe741 100644 --- a/ridljar/javamaker/Makefile +++ b/ridljar/javamaker/Makefile @@ -29,7 +29,8 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : $(OUTDIR)/bin/udkapi.rdb - $(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@ + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@) .DEFAULT_GOAL := all .PHONY : all diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile index 7c21708..d39e96b 100644 --- a/unoil/javamaker/Makefile +++ b/unoil/javamaker/Makefile @@ -29,8 +29,9 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : + $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ - touch $@ + touch $@) .DEFAULT_GOAL := all .PHONY : all commit 2faa029ade2b1bec92016e78b744502fbf680e38 Author: Matus Kukan <matus.ku...@gmail.com> Date: Wed Feb 15 23:25:11 2012 +0100 jvmfwk: these are also linked_libs diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5638164..e58dade 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,jvmfwk,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_libs,jvmfwk,\ +$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 9ce5461..734e564 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_libs,sunjavaplugin,\ +$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ advapi32 \ uwinapi \ )) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits