diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:28:50 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:28:50 +0000 |
| commit | aec21ea5c2625a99ceaa63e189c810f1953ca1e4 (patch) | |
| tree | 813f8474b9acd61f2d4c694e4ff6f42ba5c55630 /jfreereport | |
| parent | ae7e5e50f410ad4b65aa528420d8df898d41cbfc (diff) | |
INTEGRATION: CWS pentaho1 (1.3.6); FILE MERGED
2007/10/23 05:45:48 oj 1.3.6.2: #i80723# #i81510# makefile changes
2007/10/22 11:41:23 oj 1.3.6.1: #i80723# #i81510# switch to new branch from pentaho
Diffstat (limited to 'jfreereport')
| -rw-r--r-- | jfreereport/java/jcommon-serializer/makefile.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/jfreereport/java/jcommon-serializer/makefile.mk b/jfreereport/java/jcommon-serializer/makefile.mk index 447c507ba399..7a38afc8674b 100644 --- a/jfreereport/java/jcommon-serializer/makefile.mk +++ b/jfreereport/java/jcommon-serializer/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2007-08-03 10:11:24 $ +# last change: $Author: ihi $ $Date: 2008-01-14 15:28:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,13 +37,14 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=jcommon-serializer +VERSION=-0.2.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk # override buildfile -ANT_BUILDFILE=ant$/build.xml +ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk @@ -54,18 +55,19 @@ TARFILE_NAME=$(TARGET) TARFILE_ROOTDIR=$(TARGET) -PATCH_FILE_NAME=patches/$(TARGET).patch - -CONVERTFILES=ant$/build.xml\ - ant$/build.properties +PATCH_FILE_NAME=patches$/$(TARGET).patch +CONVERTFILES=build.xml\ + build.properties + +OUT2CLASS=$(TARGET)$(VERSION).jar .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" |