summaryrefslogtreecommitdiff
path: root/jfreereport/java/librepository/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'jfreereport/java/librepository/makefile.mk')
-rw-r--r--jfreereport/java/librepository/makefile.mk23
1 files changed, 9 insertions, 14 deletions
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 7dad4ed185b7..d6bdab754f88 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=librepository
-VERSION=-0.1.4
+VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
.INCLUDE : antsettings.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
TARFILE_NAME=$(TARGET)
-
TARFILE_ROOTDIR=$(TARGET)
-
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
- build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+
.ENDIF