summaryrefslogtreecommitdiff
path: root/swext/Extension_wiki-publisher.mk
diff options
context:
space:
mode:
Diffstat (limited to 'swext/Extension_wiki-publisher.mk')
-rw-r--r--swext/Extension_wiki-publisher.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 7dc713c6ae2e..5e04323e180b 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -13,14 +13,20 @@ $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
$(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml))
+$(eval $(call gb_Extension_use_package,wiki-publisher,apache_commons_logging))
+
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_codec))
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang))
+
$(eval $(call gb_Extension_use_default_description,wiki-publisher))
$(eval $(call gb_Extension_use_default_license,wiki-publisher))
ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(OUTDIR)/bin/commons-codec-1.6.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(OUTDIR)/bin/commons-lang-2.4.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar))
endif
$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)))
$(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))