diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 13:41:17 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 13:41:17 +0000 |
| commit | dc0c53db2abd77ae481ba30280b153cca47c3230 (patch) | |
| tree | 5c583b4e7449e3da488ecebff4723f5ed818cb2f /jfreereport | |
| parent | 75c1670171db15129ce0237eb9635ba664561f70 (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 'jfreereport')
| -rw-r--r-- | jfreereport/java/libbase/makefile.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk index 0fab39a8a2c6..c11070d0a12a 100644 --- a/jfreereport/java/libbase/makefile.mk +++ b/jfreereport/java/libbase/makefile.mk @@ -66,13 +66,22 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging-1.1.1.jar ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/commons-logging-1.1.1.jar : - $(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar - -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging-1.1.1.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) +# XCLASSPATH/CLASSPATH does not work and we only can give lib once. But +# the build.xmls fortunately take *.jar out of lib so we can copy our +# commons-logging.jar here - yes, even in the system-apache commons case. +# Sucks. +$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging.jar + +$(CLASSDIR)$/commons-logging.jar : +.IF "$(SYSTEM_APACHE_COMMONS)" != "YES" + $(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar +.ELSE + $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar +.ENDIF + +$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar .ENDIF |