diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 20:10:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:14 +0200 |
| commit | cdbd6957a59183667f65dcb233bd9ddffd7b6e91 (patch) | |
| tree | fc0e31ba2960284d0be72e7c88f133e84b20215b /xmerge | |
| parent | 8b8e749fae45ba41e361897b447173fb6a26eb38 (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')
| -rw-r--r-- | xmerge/Jar_XMergeBridge.mk | 4 | ||||
| -rw-r--r-- | xmerge/Jar_xmerge.mk | 3 |
2 files changed, 2 insertions, 5 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 \ diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk index 27de50bf06a3..dcd9edcf0c38 100644 --- a/xmerge/Jar_xmerge.mk +++ b/xmerge/Jar_xmerge.mk @@ -38,7 +38,8 @@ $(eval $(call gb_Jar_use_jars,xmerge,\ $(OUTDIR)/bin/juh.jar \ )) -$(eval $(call gb_Jar_set_jarclasspath,xmerge,\ +# FIXME: what is this stuff good for??? +$(eval $(call gb_Jar_add_manifest_classpath,xmerge,\ xml-apis.jar \ xercesImpl.jar \ serializer.jar \ |