summaryrefslogtreecommitdiff
path: root/jfreereport/java/flute/makefile.mk
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2009-12-03 08:27:54 +0100
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2009-12-03 08:27:54 +0100
commit167c531dae4e9b8d11666f45abfe981d6d238732 (patch)
treee9c6957a781a702a7ea565da2027504d2b53c3b8 /jfreereport/java/flute/makefile.mk
parent8146fda3eba555ac762aa7b98634d9bb1c385f7a (diff)
srb1: #i99049# add new lib from pentaho
Diffstat (limited to 'jfreereport/java/flute/makefile.mk')
-rw-r--r--jfreereport/java/flute/makefile.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index a5bef2a6563c..d0d8cc865b04 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -33,26 +33,26 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=flute
-VERSION=1.1.2
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(VERSION)
+TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION)
#TARFILE_ROOTDIR=$(TARGET)
TARFILE_IS_FLAT=true
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(FLUTE_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -66,9 +66,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
.IF "$(L10N_framework)"==""
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
-$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar
+$(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(FLUTE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar
.ENDIF
.ENDIF