summaryrefslogtreecommitdiff
path: root/reportbuilder/util/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 /reportbuilder/util/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 'reportbuilder/util/makefile.mk')
-rw-r--r--reportbuilder/util/makefile.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 0dd34f039078..6cb9d9808087 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -110,7 +110,10 @@ COMPONENT_EXTJARFILES += \
$(EXTENSIONDIR)$/librepository-1.0.0.jar \
$(EXTENSIONDIR)$/libxml-1.0.0.jar \
$(EXTENSIONDIR)$/flow-engine-0.9.2.jar \
- $(EXTENSIONDIR)$/sac.jar \
+ $(EXTENSIONDIR)$/sac.jar
+.ENDIF
+.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
+COMPONENT_EXTJARFILES += \
$(EXTENSIONDIR)$/commons-logging-1.1.1.jar
.ENDIF