diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:03:00 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:12 +0100 |
| commit | 4c3626af6beb2a06b04bb2dbed9375a359c37a36 (patch) | |
| tree | 9ae56df27df9e3227e67e0c96f1e7214eccc9a0a /scp2/InstallModule_ooo.mk | |
| parent | scp2: move apache-commons to AutoInstall (diff) | |
| download | core-4c3626af6beb2a06b04bb2dbed9375a359c37a36.tar.gz core-4c3626af6beb2a06b04bb2dbed9375a359c37a36.zip | |
scp2: move jfreereport to AutoInstall
Change-Id: I13bf9d1b75b3da1a8b6925f12eca938141fc9baf
Diffstat (limited to 'scp2/InstallModule_ooo.mk')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index ea11a30916f9..8eafe810947a 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -7,12 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(ENABLE_REPORTBUILDER),TRUE) -ifeq ($(SYSTEM_JFREEREPORT),) -include $(SRCDIR)/external/jfreereport/version.mk -endif -endif - $(eval $(call gb_InstallModule_InstallModule,scp2/ooo)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ @@ -40,7 +34,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_HUNSPELL \ SYSTEM_HYPH \ SYSTEM_ICU \ - SYSTEM_JFREEREPORT \ SYSTEM_JPEG \ SYSTEM_LCMS2 \ SYSTEM_LIBEXTTEXTCAT \ @@ -105,21 +98,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ -DICU_MAJOR=$(ICU_MAJOR) \ )) -ifeq ($(SYSTEM_JFREEREPORT),) - -$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ - -DFLUTE_VERSION=$(FLUTE_VERSION) \ - -DLIBBASE_VERSION=$(LIBBASE_VERSION) \ - -DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \ - -DLIBFORMULA_VERSION=$(LIBFORMULA_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 \ |