summaryrefslogtreecommitdiff
path: root/xmerge/Jar_XMergeBridge.mk
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 /xmerge/Jar_XMergeBridge.mk
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 'xmerge/Jar_XMergeBridge.mk')
-rw-r--r--xmerge/Jar_XMergeBridge.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index a346b05bea92..5bc4c03f2d28 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/ma
$(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
-$(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\
- xmerge.jar \
-))
-
$(eval $(call gb_Jar_use_jars,XMergeBridge,\
$(OUTDIR)/bin/xmerge.jar \
$(OUTDIR)/bin/unoil.jar \