diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 21:01:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:30 +0200 |
| commit | 070ca1e280e5efd4c94970e405d2ca0736438472 (patch) | |
| tree | 5326abda0529e423d2e15b2b34624df515ceb36a /scp2 | |
| parent | 30ad101b102e4d69c9d2c55884ab975145d8c1db (diff) | |
jfreereport: stop pointlessly renaming the jar files
Change-Id: Ia2c5ce1176496e98643e2cefc65d4c6d0cf9c781
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_reportbuilder.scp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 830d0a40f3e8..4d4e33d0557b 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -137,12 +137,10 @@ 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) \ diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp index 1c5b0f3e187a..9e0ba424e752 100644 --- a/scp2/source/ooo/module_reportbuilder.scp +++ b/scp2/source/ooo/module_reportbuilder.scp @@ -57,12 +57,12 @@ STD_JAR_FILE(gid_File_Jar_CommonsLogging, commons-logging-1.1.1) /* Not sure, if can we use CONCAT3 in that context here? */ #ifndef SYSTEM_JFREEREPORT - STD_JAR_FILE( gid_File_Jar_FlowEngine, CONCAT3(flow-engine,-,FLOW_ENGINE_VERSION) ) + STD_JAR_FILE( gid_File_Jar_FlowEngine, flow-engine ) STD_JAR_FILE( gid_File_Jar_Flute, CONCAT3(flute,-,FLUTE_VERSION) ) STD_JAR_FILE( gid_File_Jar_Libbase, CONCAT3(libbase,-,LIBBASE_VERSION) ) STD_JAR_FILE( gid_File_Jar_Libfonts, CONCAT3(libfonts,-,LIBFONTS_VERSION) ) STD_JAR_FILE( gid_File_Jar_Libformula, CONCAT3(libformula,-,LIBFORMULA_VERSION) ) - STD_JAR_FILE( gid_File_Jar_Liblayout, CONCAT3(liblayout,-,LIBLAYOUT_VERSION) ) + STD_JAR_FILE( gid_File_Jar_Liblayout, liblayout ) STD_JAR_FILE( gid_File_Jar_Libloader, CONCAT3(libloader,-,LIBLOADER_VERSION) ) STD_JAR_FILE( gid_File_Jar_Librepository, CONCAT3(librepository,-,LIBREPOSITORY_VERSION) ) STD_JAR_FILE( gid_File_Jar_Libserializer, CONCAT3(libserializer,-,LIBSERIALIZER_VERSION) ) |