Kaydet (Commit) 97cf2b8d authored tarafından David Tardon's avatar David Tardon

fix build with system jfreereport

üst df2b2247
......@@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
.ELSE
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
JARFILES += \
libbase-$(LIBBASE_VERSION).jar \
libformula-$(LIBFORMULA_VERSION).jar
......
......@@ -33,13 +33,13 @@ PACKAGE = com$/sun$/star$/report$/pentaho
nodep=true
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR)
.ELSE
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
JARFILES += \
flute-$(FLUTE_VERSION).jar \
libserializer-$(LIBSERIALIZER_VERSION).jar \
......
......@@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/util
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
.ELSE
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
JARFILES += \
libbase-$(LIBBASE_VERSION).jar \
libxml-$(LIBXML_VERSION).jar \
......
......@@ -38,7 +38,6 @@ EXTENSION_VERSION_BASE=1.2.1
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
......@@ -95,6 +94,7 @@ COMPONENT_EXTJARFILES = \
$(EXTENSIONDIR)$/reportbuilderwizard.jar
.IF "$(SYSTEM_JFREEREPORT)" != "YES"
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
COMPONENT_EXTJARFILES += \
$(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar \
$(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment