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

10 files changed, 2 insertions, 38 deletions

diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
index 3d61f3b923e7..03ef000f39cc 100644
--- a/wizards/Jar_agenda.mk
+++ b/wizards/Jar_agenda.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Jar_use_jars,agenda,\
 
 $(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,agenda,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_set_packageroot,agenda,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,agenda,\
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 19c8bdcc0466..6802c40b3c01 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -40,7 +40,8 @@ $(eval $(call gb_Jar_set_packageroot,commonwizards,com))
 
 $(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,commonwizards,saxon9.jar))
+# FIXME: what is this doing here?
+$(eval $(call gb_Jar_add_manifest_classpath,commonwizards,saxon9.jar))
 
 $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
 	wizards/com/sun/star/wizards/common/HelpIds	                		\
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
index a25a20a3c1a6..96a7fbbe5e7f 100644
--- a/wizards/Jar_fax.mk
+++ b/wizards/Jar_fax.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,fax,com))
 
 $(eval $(call gb_Jar_set_manifest,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,fax,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,fax,\
 	wizards/com/sun/star/wizards/fax/CallWizard \
 	wizards/com/sun/star/wizards/fax/CGFax \
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index 54e490869402..bd4cdba07132 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,form,$(SRCDIR)/wizards/com/sun/star/wizards/fo
 
 $(eval $(call gb_Jar_set_packageroot,form,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,form,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,form,\
 	wizards/com/sun/star/wizards/form/CallFormWizard \
 	wizards/com/sun/star/wizards/form/DataEntrySetter \
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
index 4d6133e84b88..63d1105864ce 100644
--- a/wizards/Jar_letter.mk
+++ b/wizards/Jar_letter.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,letter,$(SRCDIR)/wizards/com/sun/star/wizards/
 
 $(eval $(call gb_Jar_set_packageroot,letter,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,letter,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,letter,\
 	wizards/com/sun/star/wizards/letter/CallWizard \
 	wizards/com/sun/star/wizards/letter/CGLetter \
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index 000ce7d22693..1c9496f2b643 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -40,10 +40,6 @@ $(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/q
 
 $(eval $(call gb_Jar_set_packageroot,query,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,query,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,query,\
 	wizards/com/sun/star/wizards/query/CallQueryWizard \
 	wizards/com/sun/star/wizards/query/Finalizer \
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index b9660dd7e107..5fd3d26c6b56 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/
 
 $(eval $(call gb_Jar_set_packageroot,report,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,report,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,report,\
 	wizards/com/sun/star/wizards/report/CallReportWizard \
 	wizards/com/sun/star/wizards/report/Dataimport \
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index d190874a5b98..9148d34a94f1 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
 
 $(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\
-	commonwizards.jar \
-	report.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,reportbuilderwizard,\
 	wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation \
 	wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn \
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index 7bc9102d9a90..ba1608c61d85 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,table,com))
 
 $(eval $(call gb_Jar_set_manifest,table,$(SRCDIR)/wizards/com/sun/star/wizards/table/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,table,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,table,\
 	wizards/com/sun/star/wizards/table/CallTableWizard \
 	wizards/com/sun/star/wizards/table/CGCategory \
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
index a31a2f647a44..085c7693ceff 100644
--- a/wizards/Jar_web.mk
+++ b/wizards/Jar_web.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,web,com))
 
 $(eval $(call gb_Jar_set_manifest,web,$(SRCDIR)/wizards/com/sun/star/wizards/web/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,web,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,web,\
 	wizards/com/sun/star/wizards/web/AbstractErrorHandler \
 	wizards/com/sun/star/wizards/web/BackgroundsDialog \