From 070ca1e280e5efd4c94970e405d2ca0736438472 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 25 Oct 2013 21:01:58 +0200 Subject: jfreereport: stop pointlessly renaming the jar files Change-Id: Ia2c5ce1176496e98643e2cefc65d4c6d0cf9c781 --- external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk | 2 +- external/jfreereport/ExternalPackage_jfreereport_liblayout.mk | 2 +- external/jfreereport/version.mk | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'external/jfreereport') diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk index 1482967b91c0..ca60a2716e5d 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -14,6 +14,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreere $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine.jar,build/lib/flow-engine.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk index fc19dd1554fb..c5d330b73fe8 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -14,6 +14,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreerepo $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout.jar,build/lib/liblayout.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/version.mk b/external/jfreereport/version.mk index 4156932d87c7..af5980f4a5a3 100644 --- a/external/jfreereport/version.mk +++ b/external/jfreereport/version.mk @@ -3,10 +3,8 @@ LIBBASE_VERSION=1.1.6 LIBFONTS_VERSION=1.1.6 LIBFORMAT_VERSION=1.1.6 LIBFORMULA_VERSION=1.1.7 -LIBLAYOUT_VERSION=0.2.10 LIBLOADER_VERSION=1.1.6 LIBREPOSITORY_VERSION=1.1.6 LIBSERIALIZER_VERSION=1.1.6 LIBXML_VERSION=1.1.7 -FLOW_ENGINE_VERSION=0.9.4 -- cgit