summaryrefslogtreecommitdiff
path: root/apache-commons/java/logging/makefile.mk
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2009-03-23 13:41:17 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2009-03-23 13:41:17 +0000
commitdc0c53db2abd77ae481ba30280b153cca47c3230 (patch)
tree5c583b4e7449e3da488ecebff4723f5ed818cb2f /apache-commons/java/logging/makefile.mk
parent75c1670171db15129ce0237eb9635ba664561f70 (diff)
CWS-TOOLING: integrate CWS rptfix06_DEV300
2009-03-19 08:14:23 +0100 rene r269715 : #i10000# 2009-03-18 23:48:16 +0100 rene r269709 : #i100334# also reportbuilder 2009-03-18 22:39:42 +0100 rene r269706 : #i100334# fix build with system apache-commons 2009-03-18 22:34:24 +0100 rene r269705 : #i100335# build libs only when needed 2009-03-17 13:24:17 +0100 rene r269600 : fix system-* for the SRB
Diffstat (limited to 'apache-commons/java/logging/makefile.mk')
-rw-r--r--apache-commons/java/logging/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
index ab3476974b1b..8874c700a998 100644
--- a/apache-commons/java/logging/makefile.mk
+++ b/apache-commons/java/logging/makefile.mk
@@ -43,7 +43,7 @@ ANT_BUILDFILE=build.xml
.INCLUDE : antsettings.mk
-.IF "$(SOLAR_JAVA)" != ""
+.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
# --- Files --------------------------------------------------------
TARFILE_NAME=commons-logging-1.1.1-src
@@ -75,7 +75,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) -Ds
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != ""
+.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
.INCLUDE : tg_ext.mk
.ENDIF