diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 21:04:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:31 +0200 |
| commit | a40fb598ec8ebb4a8c8793dd7be6ef93ae8941c1 (patch) | |
| tree | 3da69420dcecd6567d7c85aacf8fe65defa30146 /external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | |
| parent | 070ca1e280e5efd4c94970e405d2ca0736438472 (diff) | |
jfreereport: use jar files from WORKDIR
Change-Id: Ie3d706841faae40e6172ae36894f4ad700d70571
Diffstat (limited to 'external/jfreereport/ExternalProject_jfreereport_flow_engine.mk')
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index d88b1c9f58e5..f8d79d7b2211 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine)) -$(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\ +$(eval $(call gb_ExternalProject_use_external_projects,jfreereport_flow_engine,\ jfreereport_liblayout \ )) @@ -26,7 +26,12 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ - -Dlib=$(OUTDIR)/bin \ + -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ + -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ + -Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \ + -Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \ + -Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \ + -Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ |