Kaydet (Commit) 999f7fb8 authored tarafından Michael Stahl's avatar Michael Stahl

swext: use gb_Jar_use_externals

Change-Id: Ib62473d841bc9a66acde6529d3f63e3fd1a00928
üst 666173b8
...@@ -33,16 +33,12 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com)) ...@@ -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)) $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF))
ifeq ($(SYSTEM_APACHE_COMMONS),YES) $(eval $(call gb_Jar_use_externals,mediawiki,\
# FIXME: use gb_Jar_use_externals? commons-codec \
# for the build commons-lang \
$(eval $(call gb_Jar_use_jars,mediawiki,\ commons-httpclient \
$(COMMONS_CODEC_JAR) \ commons-logging \
$(COMMONS_LANG_JAR) \
$(COMMONS_HTTPCLIENT_JAR) \
$(COMMONS_LOGGING_JAR) \
)) ))
endif
$(eval $(call gb_Jar_use_jars,mediawiki,\ $(eval $(call gb_Jar_use_jars,mediawiki,\
$(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/juh.jar \
...@@ -51,15 +47,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\ ...@@ -51,15 +47,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\
$(OUTDIR)/bin/unoil.jar \ $(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,\ $(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
swext/mediawiki/src/com/sun/star/wiki/EditPageParser \ swext/mediawiki/src/com/sun/star/wiki/EditPageParser \
swext/mediawiki/src/com/sun/star/wiki/Helper \ swext/mediawiki/src/com/sun/star/wiki/Helper \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment