diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-03-13 22:45:02 +0100 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-18 15:30:44 +0000 |
| commit | 90a326c7028d5af132c62edfaef77c53627e4c0e (patch) | |
| tree | 61d963c6d5da61755e5072e2ef765d8243361246 /scp2/InstallModule_ooo.mk | |
| parent | 35bc07513c46cfa40fa85ec1053f7ce5c1e9c318 (diff) | |
fdo#61950 move report builder from bundled extensions to plain code
For test sample report from fdo#61726 can be used.
Change-Id: Iacf8ddc4cf8ad0a408d72e18ecb7237476afeffe
Reviewed-on: https://gerrit.libreoffice.org/2718
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'scp2/InstallModule_ooo.mk')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 0d3aa52ef054..25adf4b867a1 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -25,6 +25,12 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +ifeq ($(ENABLE_REPORTBUILDER),TRUE) +ifneq ($(SYSTEM_JFREEREPORT),YES) +include $(SRCDIR)/jfreereport/version.mk +endif +endif + $(eval $(call gb_InstallModule_InstallModule,scp2/ooo)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,ooo)) @@ -51,6 +57,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_TDEAB \ ENABLE_TELEPATHY \ MERGELIBS \ + SYSTEM_APACHE_COMMONS \ SYSTEM_BOOST \ SYSTEM_CAIRO \ SYSTEM_CLUCENE \ @@ -61,6 +68,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_HUNSPELL \ SYSTEM_HYPH \ SYSTEM_ICU \ + SYSTEM_JFREEREPORT \ SYSTEM_JPEG \ SYSTEM_LCMS2 \ SYSTEM_LIBEXTTEXTCAT \ @@ -178,6 +186,23 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ )) endif +ifneq ($(SYSTEM_JFREEREPORT),YES) + +$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ + -DFLOW_ENGINE_VERSION=$(FLOW_ENGINE_VERSION) \ + -DFLUTE_VERSION=$(FLUTE_VERSION) \ + -DLIBBASE_VERSION=$(LIBBASE_VERSION) \ + -DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \ + -DLIBFORMULA_VERSION=$(LIBFORMULA_VERSION) \ + -DLIBLAYOUT_VERSION=$(LIBLAYOUT_VERSION) \ + -DLIBLOADER_VERSION=$(LIBLOADER_VERSION) \ + -DLIBREPOSITORY_VERSION=$(LIBREPOSITORY_VERSION) \ + -DLIBSERIALIZER_VERSION=$(LIBSERIALIZER_VERSION) \ + -DLIBXML_VERSION=$(LIBXML_VERSION) \ +)) + +endif + $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\ scp2/source/templates/module_helppack \ scp2/source/templates/module_helppack_root \ @@ -223,4 +248,10 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ )) endif +ifeq ($(ENABLE_REPORTBUILDER),TRUE) +$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ + scp2/source/ooo/module_reportbuilder \ +)) +endif + # vim: set shiftwidth=4 tabstop=4 noexpandtab: |