diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
| commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
| tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /swext | |
| parent | a16060116346533923c607bd406d3fea511b41ec (diff) | |
gbuild: "use" vs. "add":
Naming convention for gbuild methods:
- "add" is used for stuff that is logically a part of the target
(i.e. not registered at the Module, but defined in the target's makefile)
- "use" is used for stuff that is logically a different target
(i.e. it is registered at the Module, has it's own makefile, may be
in a different module than the target)
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Jar_mediawiki.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index 5661927c962f..0fc4feec6e0d 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/su ifeq ($(SYSTEM_APACHE_COMMONS),YES) # FIXME: use gb_Jar_use_externals? # for the build -$(eval $(call gb_Jar_add_jars,mediawiki,\ +$(eval $(call gb_Jar_use_jars,mediawiki,\ $(COMMONS_CODEC_JAR) \ $(COMMONS_LANG_JAR) \ $(COMMONS_HTTPCLIENT_JAR) \ @@ -58,7 +58,7 @@ $(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ )) endif -$(eval $(call gb_Jar_add_jars,mediawiki,\ +$(eval $(call gb_Jar_use_jars,mediawiki,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ @@ -66,7 +66,7 @@ $(eval $(call gb_Jar_add_jars,mediawiki,\ )) ifneq ($(SYSTEM_APACHE_COMMONS),YES) -$(eval $(call gb_Jar_add_jars,mediawiki,\ +$(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 \ |