summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-08-15 20:10:10 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-15 21:29:14 +0200
commitcdbd6957a59183667f65dcb233bd9ddffd7b6e91 (patch)
treefc0e31ba2960284d0be72e7c88f133e84b20215b /qadevOOo
parent8b8e749fae45ba41e361897b447173fb6a26eb38 (diff)
gbuild: remove most uses of gb_Jar_set_jarclasspath:
With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest classpath automatically it is no longer necessary to call gb_Jar_set_jarclasspath manually except for the URE jars, which are apparently not supposed to be added automatically. Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk2
-rw-r--r--qadevOOo/Jar_OOoRunnerLight.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9ef3da9638fa..6de3757fa47b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -32,7 +32,7 @@ gb_JavaClassSet_JAVACDEBUG:= -g
$(eval $(call gb_Jar_Jar,OOoRunner))
-$(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\
+$(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\
ridl.jar \
unoil.jar \
))
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
index 1c58eef0608c..9b79ddbd632b 100644
--- a/qadevOOo/Jar_OOoRunnerLight.mk
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -32,7 +32,7 @@ gb_JavaClassSet_JAVACDEBUG := -g
$(eval $(call gb_Jar_Jar,OOoRunnerLight))
-$(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\
+$(eval $(call gb_Jar_add_manifest_classpath,OOoRunnerLight,\
ridl.jar \
unoil.jar \
))