diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
commit | 761118f831295454a896a6d2921db0d8212fcd5b (patch) | |
tree | 40872f5c098ce390ef666bf86fcb124af6697989 /reportbuilder/util/makefile.mk | |
parent | 459cbc6cada544c9e50cf4f86dc821853f26deda (diff) | |
parent | 39250f089adfce87856a0a7a250511decd7418e2 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
jfreereport/java/flute/makefile.mk
jfreereport/java/libbase/makefile.mk
jfreereport/java/libfonts/makefile.mk
jfreereport/java/libformula/makefile.mk
jfreereport/java/libloader/makefile.mk
jfreereport/java/librepository/makefile.mk
jfreereport/java/libserializer/makefile.mk
jfreereport/java/libxml/makefile.mk
jfreereport/java/sac/makefile.mk
mysqlc/source/mysqlc_connection.cxx
mysqlc/source/mysqlc_connection.hxx
mysqlc/source/mysqlc_databasemetadata.cxx
mysqlc/source/mysqlc_databasemetadata.hxx
mysqlc/source/mysqlc_driver.cxx
mysqlc/source/mysqlc_driver.hxx
mysqlc/source/mysqlc_general.hxx
mysqlc/source/mysqlc_preparedstatement.hxx
mysqlc/source/mysqlc_resultsetmetadata.hxx
mysqlc/source/mysqlc_statement.hxx
sdext/source/minimizer/impoptimizer.cxx
sdext/source/pdfimport/config/description.xml
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/presenter/PresenterWindowManager.cxx
swext/prj/build.lst
Diffstat (limited to 'reportbuilder/util/makefile.mk')
-rw-r--r--[-rwxr-xr-x] | reportbuilder/util/makefile.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 55ba88c3cf6f..9dcb8b41326f 100755..100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -38,6 +38,8 @@ EXTENSION_VERSION_BASE=1.2.1 # --- Settings ---------------------------------- .INCLUDE : makefile.pmk +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk + .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ # calready set in util$/makefile.pmk @@ -94,16 +96,16 @@ COMPONENT_EXTJARFILES = \ .IF "$(SYSTEM_JFREEREPORT)" != "YES" COMPONENT_EXTJARFILES += \ - $(EXTENSIONDIR)$/flute-1.3.0.jar \ - $(EXTENSIONDIR)$/libserializer-1.0.0.jar \ - $(EXTENSIONDIR)$/libbase-1.0.0.jar \ - $(EXTENSIONDIR)$/libfonts-1.0.0.jar \ - $(EXTENSIONDIR)$/libformula-0.2.0.jar \ - $(EXTENSIONDIR)$/liblayout-0.2.9.jar \ - $(EXTENSIONDIR)$/libloader-1.0.0.jar \ - $(EXTENSIONDIR)$/librepository-1.0.0.jar \ - $(EXTENSIONDIR)$/libxml-1.0.0.jar \ - $(EXTENSIONDIR)$/flow-engine-0.9.2.jar \ + $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar \ + $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar \ + $(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar \ + $(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar \ + $(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar \ + $(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar \ + $(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar \ + $(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar \ + $(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar \ + $(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar \ $(EXTENSIONDIR)$/sac.jar .ENDIF .IF "$(SYSTEM_APACHE_COMMONS)" != "YES" |