diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 20:28:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:15 +0200 |
| commit | 999f7fb840b3cf1abd861d0fd402c70a4092454e (patch) | |
| tree | efaff25ae124f318bc9690734ceaf22cb9daabe7 /swext | |
| parent | 666173b83c55cc400f296f66b559ae2723f23795 (diff) | |
swext: use gb_Jar_use_externals
Change-Id: Ib62473d841bc9a66acde6529d3f63e3fd1a00928
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Jar_mediawiki.mk | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index 277c17f54e6c..5707347e1ab3 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -33,16 +33,12 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com)) $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF)) -ifeq ($(SYSTEM_APACHE_COMMONS),YES) -# FIXME: use gb_Jar_use_externals? -# for the build -$(eval $(call gb_Jar_use_jars,mediawiki,\ - $(COMMONS_CODEC_JAR) \ - $(COMMONS_LANG_JAR) \ - $(COMMONS_HTTPCLIENT_JAR) \ - $(COMMONS_LOGGING_JAR) \ +$(eval $(call gb_Jar_use_externals,mediawiki,\ + commons-codec \ + commons-lang \ + commons-httpclient \ + commons-logging \ )) -endif $(eval $(call gb_Jar_use_jars,mediawiki,\ $(OUTDIR)/bin/juh.jar \ @@ -51,15 +47,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\ $(OUTDIR)/bin/unoil.jar \ )) -ifneq ($(SYSTEM_APACHE_COMMONS),YES) -$(eval $(call gb_Jar_use_jars,mediawiki,\ - $(OUTDIR)/bin/commons-codec-1.3.jar \ - $(OUTDIR)/bin/commons-lang-2.3.jar \ - $(OUTDIR)/bin/commons-httpclient-3.1.jar \ - $(OUTDIR)/bin/commons-logging-1.1.1.jar \ -)) -endif - $(eval $(call gb_Jar_add_sourcefiles,mediawiki,\ swext/mediawiki/src/com/sun/star/wiki/EditPageParser \ swext/mediawiki/src/com/sun/star/wiki/Helper \ |