From cdbd6957a59183667f65dcb233bd9ddffd7b6e91 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 15 Aug 2012 20:10:10 +0200
Subject: 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
---
 reportbuilder/Jar_reportbuilder.mk | 34 ----------------------------------
 1 file changed, 34 deletions(-)

(limited to 'reportbuilder')

diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 1f7159de153c..b3faf6e13c3c 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -50,40 +50,6 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\
 	sac \
 ))
 
-$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\
-	$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
-		$(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\
-		commons-logging-1.1.1.jar \
-	) \
-	$(if $(filter YES,$(SYSTEM_JFREEREPORT)),\
-		$(foreach jar,\
-			$(FLUTE_JAR) \
-			$(JFREEREPORT_JAR) \
-			$(LIBBASE_JAR) \
-			$(LIBFONTS_JAR) \
-			$(LIBFORMULA_JAR) \
-			$(LIBLAYOUT_JAR) \
-			$(LIBLOADER_JAR) \
-			$(LIBREPOSITORY_JAR) \
-			$(LIBSERIALIZER_JAR) \
-			$(LIBXML_JAR) \
-			$(SAC_JAR) \
-			,$(call gb_Helper_make_url,$(jar)) \
-		),\
-		flow-engine-0.9.4.jar \
-		flute-1.1.6.jar \
-		libbase-1.1.6.jar \
-		libfonts-1.1.6.jar \
-		libformula-1.1.7.jar \
-		liblayout-0.2.10.jar \
-		libloader-1.1.6.jar \
-		librepository-1.1.6.jar \
-		libserializer-1.1.6.jar \
-		libxml-1.1.7.jar \
-		sac.jar \
-	) \
-))
-
 $(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
 
 $(eval $(call gb_Jar_set_packageroot,sun-report-builder,com))
-- 
cgit