diff options
29 files changed, 20 insertions, 126 deletions
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk index 586f775f3870..3cefaa8f14cb 100644 --- a/accessibility/Jar_uno_accessbridge.mk +++ b/accessibility/Jar_uno_accessbridge.mk @@ -38,10 +38,6 @@ $(eval $(call gb_Jar_set_packageroot,java_uno_accessbridge,org)) $(eval $(call gb_Jar_set_manifest,java_uno_accessbridge,$(SRCDIR)/accessibility/bridge/org/openoffice/accessibility/manifest)) -$(eval $(call gb_Jar_set_jarclasspath,java_uno_accessbridge,\ - $$(JARCLASSPATH) \ -)) - $(eval $(call gb_Jar_set_componentfile,java_uno_accessbridge,accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge,OOO)) $(eval $(call gb_Jar_add_sourcefiles,java_uno_accessbridge,\ diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk index 34fcb7c07aed..3f330e24e6ae 100644 --- a/connectivity/Jar_sdbc_hsqldb.mk +++ b/connectivity/Jar_sdbc_hsqldb.mk @@ -37,9 +37,8 @@ $(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\ )) endif -$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\ - hsqldb.jar \ - $(HSQLDB_JAR) \ +# FIXME: is this really necessary? +$(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\ .. \ )) diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk index 48160441cef5..591b7e0f2aed 100644 --- a/filter/Jar_XSLTFilter.mk +++ b/filter/Jar_XSLTFilter.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTF $(eval $(call gb_Jar_set_manifest,XSLTFilter,$(SRCDIR)/filter/source/xsltfilter/Manifest)) -$(eval $(call gb_Jar_set_jarclasspath,XSLTFilter,saxon9.jar)) - $(eval $(call gb_Jar_set_packageroot,XSLTFilter,com)) $(eval $(call gb_Jar_add_sourcefiles,XSLTFilter,\ diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk index 6ed9d239df8f..085070879538 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Jar_use_jars,juh,\ $(eval $(call gb_Jar_set_packageroot,juh,com)) -$(eval $(call gb_Jar_set_jarclasspath,juh,ridl.jar jurt.jar ../../lib/ ../bin/)) +$(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../bin/)) $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest)) diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk index 9fbabec3c016..1528c9284598 100644 --- a/jurt/Jar_jurt.mk +++ b/jurt/Jar_jurt.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Jar_set_packageroot,jurt,com)) $(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest)) -$(eval $(call gb_Jar_set_jarclasspath,jurt, \ +$(eval $(call gb_Jar_add_manifest_classpath,jurt, \ ridl.jar unoloader.jar ../../lib/ ../bin/)) $(eval $(call gb_Jar_add_sourcefiles,jurt,\ diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk index a3db34a795fd..8b0b3de5b30f 100644 --- a/nlpsolver/Jar_nlpsolver.mk +++ b/nlpsolver/Jar_nlpsolver.mk @@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,nlpsolver,com)) $(eval $(call gb_Jar_set_manifest,nlpsolver,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Manifest.mf)) -$(eval $(call gb_Jar_set_jarclasspath,nlpsolver,\ - EvolutionarySolver.jar \ -)) - $(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Registration \ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo \ 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 \ )) 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)) diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index dc6f4dc7f931..228896d4c06a 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ - ScriptFramework.jar \ - $(if $(filter-out YES,$(SYSTEM_BSH)),bsh.jar) \ -)) - $(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO)) $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com)) diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index bcff02d6f6f1..74c9ddf308da 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/scripting/Jar_ScriptProviderForJava.mk @@ -38,9 +38,6 @@ $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\ $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO)) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJava, \ - ScriptFramework.jar)) - $(eval $(call gb_Jar_set_manifest,ScriptProviderForJava,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF)) $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com)) diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 16c2cf4eb458..84dfe8301fc3 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\ $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF)) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \ - ScriptFramework.jar \ - $(if $(filter-out YES,$(SYSTEM_RHINO)),js.jar) \ -)) - $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com)) diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk index 8069efe25d35..b318380807a1 100644 --- a/smoketest/Jar_TestExtension.mk +++ b/smoketest/Jar_TestExtension.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Jar_Jar,TestExtension)) $(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF)) -$(eval $(call gb_Jar_set_jarclasspath,TestExtension,\ +$(eval $(call gb_Jar_add_manifest_classpath,TestExtension,\ juh.jar \ jurt.jar \ ridl.jar \ diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 88616a3433a8..1b9b370628ac 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -162,7 +162,8 @@ endef # JARCLASSPATH is the class path that is written to the manifest of the jar define gb_Jar_set_jarclasspath -$(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2) +$$(call gb_Output_error,\ + gb_Jar_set_jarclasspath: use gb_Jar_add_manifest_classpath instead.) endef @@ -185,10 +186,14 @@ $$(call gb_Output_error,\ gb_Jar_add_jar: use gb_Jar_use_jar instead.) endef +# these are not added to manifest classpath +gb_Jar_default_jars := unoloader ridl jurt unoil juh java_uno + # remember: classpath is "inherited" to ClassSet define gb_Jar_use_jar $(call gb_JavaClassSet_use_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) -$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2))) +$(if $(filter-out $(gb_Jar_default_jars),$(basename $(notdir $(2)))),\ + $(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))) endef diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index 0fc4feec6e0d..277c17f54e6c 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -42,20 +42,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\ $(COMMONS_HTTPCLIENT_JAR) \ $(COMMONS_LOGGING_JAR) \ )) -# Class-Path: in MANIFEST.MF -$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ - $(COMMONS_CODEC_JAR) \ - $(COMMONS_LANG_JAR) \ - $(COMMONS_HTTPCLIENT_JAR) \ - $(COMMONS_LOGGING_JAR) \ -)) -else -$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ - commons-codec-1.3.jar \ - commons-lang-2.3.jar \ - commons-httpclient-3.1.jar \ - commons-logging-1.1.1.jar \ -)) endif $(eval $(call gb_Jar_use_jars,mediawiki,\ diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk index f68b5a2931e4..23be65582935 100644 --- a/unotest/Jar_test-tools.mk +++ b/unotest/Jar_test-tools.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,test-tools)) -$(eval $(call gb_Jar_set_jarclasspath,test-tools,\ +$(eval $(call gb_Jar_add_manifest_classpath,test-tools,\ juh.jar \ ridl.jar \ unoil.jar \ diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk index 6c4e4aa78692..9f718cc871cd 100644 --- a/unotest/Jar_test.mk +++ b/unotest/Jar_test.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,test)) -$(eval $(call gb_Jar_set_jarclasspath,test,\ +$(eval $(call gb_Jar_add_manifest_classpath,test,\ juh.jar \ ridl.jar \ unoil.jar \ 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 \ 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 \ |