diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-07 09:18:27 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-07 09:18:27 +0100 |
| commit | 21adfcda8071a0df2ae7c72cdf42a28c32bdaef8 (patch) | |
| tree | b401ecc41116b38d9328e709d6d035ec58fc5614 /reportbuilder | |
| parent | srb1: #i99049# patch common_build.xml (diff) | |
| download | core-21adfcda8071a0df2ae7c72cdf42a28c32bdaef8.tar.gz core-21adfcda8071a0df2ae7c72cdf42a28c32bdaef8.zip | |
srb1: #i99049# use version include
Diffstat (limited to 'reportbuilder')
| -rw-r--r-- | reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | 5 | ||||
| -rw-r--r-- | reportbuilder/java/com/sun/star/report/util/makefile.mk | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk index 1025bcea7cb7..90060e44db32 100644 --- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk @@ -36,12 +36,15 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" CLASSPATH!:==$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR) .ELSE -JARFILES += libbase-1.0.0.jar libformula-0.2.0.jar +JARFILES += \ + libbase-$(LIBBASE_VERSION).jar \ + libformula-$(LIBFORMULA_VERSION).jar .ENDIF JAVAFILES := AuthorFunction.java \ diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk index 5ef3f02b0a1f..8962f3f69e12 100644 --- a/reportbuilder/java/com/sun/star/report/util/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk @@ -36,12 +36,16 @@ PACKAGE = com$/sun$/star$/report$/util # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR) .ELSE -JARFILES = libbase-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar +JARFILES += \ + libbase-$(LIBBASE_VERSION).jar \ + libxml-$(LIBXML_VERSION).jar \ + flow-engine-$(FLOW_ENGINE_VERSION).jar .ENDIF JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java ManifestWriter.java |