diff options
| author | David Tardon <dtardon@redhat.com> | 2011-03-29 17:32:13 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-03-29 17:32:13 +0200 |
| commit | 717d4d5ce57373525aa16b592fe9f248e3d8f7c2 (patch) | |
| tree | fd342337ed9fa517c6a15abff5de301119037e26 | |
| parent | 972e7a5bea34c8bffc3d87dfb28987659096f698 (diff) | |
fix build with system jfreereport
4 files changed, 4 insertions, 4 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 9ba0c02..11501b1 100644 --- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk @@ -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 diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk index d309e1d..1f1aeb5 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk @@ -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 \ diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk index 70e290e..6cc9a14 100644 --- a/reportbuilder/java/com/sun/star/report/util/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk @@ -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 \ diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 9dcb8b4..21e30f4 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -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 \ |