gbuildification of jfreereport

In dmake jfreereport build system an intermediate directory classes was used.
All artefacts that created during build were copied there, including external
apache-commons-logging.jar. Finally java system property was used -Dlib=classes.

In gbuild we don't want to mess with copying artefacts around.
The artefacts are packaging in $(OUTDIR)/bin and java system
property points to -Dlib=$(OUTDIR)/bin. However the dependencies must
be set inside jfreereport module, because of jar interdependency:
liblayout depends on other jars and flow-engine depends on liblayout.
This is achived with new function gb_ExternalProject_use_packages.

Special treatment is necessary when system apache-commons library is used,
in which case it is not reside in $(OUTDIR)/bin, but in
/usr/share/java/commons-logging.jar or in custom location. For that
purpose the both patches: flow-engine.patch and liblayout.patch were extended
and new java system property was introduced -Dcommons-logging.jar and passed
to the build.xml. A dependency from liblayout to apache-commons-logging is set.

jfreereport was moved to tail_build module.

Change-Id: I32e39bb5f4f825f182c3bd3cfc1a13ea1c38321e
Reviewed-on: https://gerrit.libreoffice.org/761
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

58 files changed, 1097 insertions, 880 deletions

diff --git a/Makefile.top b/Makefile.top
index bb632a241546..ccf658988dac 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -89,6 +89,7 @@ idl\
 idlc\
 io\
 javaunohelper\
+jfreereport\
 jurt\
 jvmaccess\
 jvmfwk\
@@ -219,7 +220,6 @@ hunspell\
 hyphen\
 icu\
 instsetoo_native\
-jfreereport\
 jpeg\
 libcroco\
 libexttextcat\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index fa63c17da9d1..af87b1c8ae8c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	$(call gb_Helper_optional,DESKTOP,idlc) \
 	io \
 	javaunohelper \
+	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
 	jurt \
 	jvmaccess \
 	jvmfwk \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index b10b3239ba08..24d12fa4f1f9 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	$(call gb_Helper_optional,DESKTOP,idlc) \
     io \
     javaunohelper \
+	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
     jurt \
     jvmaccess \
     jvmfwk \
diff --git a/config_host.mk.in b/config_host.mk.in
index 48710b16439a..b8988b14d85f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -487,6 +487,17 @@ export RPM=@RPM@
 export RTL_OS=@RTL_OS@
 export RTL_ARCH=@RTL_ARCH@
 export SAC_JAR=@SAC_JAR@
+export JFREEREPORT_SAC_TARBALL=@JFREEREPORT_SAC_TARBALL@
+export JFREEREPORT_LIBBASE_TARBALL=@JFREEREPORT_LIBBASE_TARBALL@
+export JFREEREPORT_FLUTE_TARBALL=@JFREEREPORT_FLUTE_TARBALL@
+export JFREEREPORT_LIBLOADER_TARBALL=@JFREEREPORT_LIBLOADER_TARBALL@
+export JFREEREPORT_LIBXML_TARBALL=@JFREEREPORT_LIBXML_TARBALL@
+export JFREEREPORT_LIBFORMULA_TARBALL=@JFREEREPORT_LIBFORMULA_TARBALL@
+export JFREEREPORT_LIBFONTS_TARBALL=@JFREEREPORT_LIBFONTS_TARBALL@
+export JFREEREPORT_LIBREPOSITORY_TARBALL=@JFREEREPORT_LIBREPOSITORY_TARBALL@
+export JFREEREPORT_LIBSERIALIZER_TARBALL=@JFREEREPORT_LIBSERIALIZER_TARBALL@
+export JFREEREPORT_FLOW_ENGINE_TARBALL=@JFREEREPORT_FLOW_ENGINE_TARBALL@
+export JFREEREPORT_LIBLAYOUT_TARBALL=@JFREEREPORT_LIBLAYOUT_TARBALL@
 export SAL_ENABLE_FILE_LOCKING=1
 export SAXON_JAR=@SAXON_JAR@
 export SAXON_TARBALL=@SAXON_TARBALL@
diff --git a/configure.in b/configure.in
index 244925e869c7..e4fddeb14c4c 100644
--- a/configure.in
+++ b/configure.in
@@ -9945,6 +9945,17 @@ if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration"
         AC_MSG_RESULT([internal])
         SYSTEM_JFREEREPORT=NO
         BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
+        JFREEREPORT_SAC_TARBALL="39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+        JFREEREPORT_LIBBASE_TARBALL="eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
+        JFREEREPORT_FLUTE_TARBALL="d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
+        JFREEREPORT_LIBLOADER_TARBALL="97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
+        JFREEREPORT_LIBXML_TARBALL="ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"
+        JFREEREPORT_LIBFORMULA_TARBALL="3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
+        JFREEREPORT_LIBFONTS_TARBALL="3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
+        JFREEREPORT_LIBREPOSITORY_TARBALL="8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
+        JFREEREPORT_LIBSERIALIZER_TARBALL="f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
+        JFREEREPORT_FLOW_ENGINE_TARBALL="ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
+        JFREEREPORT_LIBLAYOUT_TARBALL="db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
     fi
 else
     AC_MSG_RESULT([no])
@@ -9955,6 +9966,17 @@ fi
 AC_SUBST(ENABLE_REPORTBUILDER)
 AC_SUBST(SYSTEM_JFREEREPORT)
 AC_SUBST(SAC_JAR)
+AC_SUBST(JFREEREPORT_SAC_TARBALL)
+AC_SUBST(JFREEREPORT_LIBBASE_TARBALL)
+AC_SUBST(JFREEREPORT_FLUTE_TARBALL)
+AC_SUBST(JFREEREPORT_LIBLOADER_TARBALL)
+AC_SUBST(JFREEREPORT_LIBXML_TARBALL)
+AC_SUBST(JFREEREPORT_LIBFORMULA_TARBALL)
+AC_SUBST(JFREEREPORT_LIBFONTS_TARBALL)
+AC_SUBST(JFREEREPORT_LIBREPOSITORY_TARBALL)
+AC_SUBST(JFREEREPORT_LIBSERIALIZER_TARBALL)
+AC_SUBST(JFREEREPORT_FLOW_ENGINE_TARBALL)
+AC_SUBST(JFREEREPORT_LIBLAYOUT_TARBALL)
 AC_SUBST(LIBXML_JAR)
 AC_SUBST(FLUTE_JAR)
 AC_SUBST(JFREEREPORT_JAR)
diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
new file mode 100644
index 000000000000..3deb87ef9dc9
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flow_engine,jfreereport_flow_engine))
+
+$(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\
+	jfreereport_liblayout \
+))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\
+			,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
+		)\
+		-Dlib=$(OUTDIR)/bin \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk
new file mode 100644
index 000000000000..120883e8dad4
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flute,jfreereport_flute))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_flute)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(FLUTE_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk
new file mode 100644
index 000000000000..6977aae621ae
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libbase,jfreereport_libbase))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBBASE_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk
new file mode 100644
index 000000000000..01de6a21832e
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libfonts,jfreereport_libfonts))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBFONTS_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk
new file mode 100644
index 000000000000..f1f329adc0ef
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libformula,jfreereport_libformula))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBFORMULA_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk
new file mode 100644
index 000000000000..afcb848a87a6
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_liblayout,jfreereport_liblayout))
+
+ifneq ($(SYSTEM_APACHE_COMMONS),YES)
+$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
+	apache_commons_logging_inc \
+))
+endif
+
+$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
+	jfreereport_sac \
+	jfreereport_libbase \
+	jfreereport_flute \
+	jfreereport_libloader \
+	jfreereport_libxml \
+	jfreereport_libformula \
+	jfreereport_libfonts \
+	jfreereport_librepository \
+	jfreereport_libserializer \
+))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\
+			,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
+		)\
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dlib=$(OUTDIR)/bin \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk
new file mode 100644
index 000000000000..bdcc7930ec57
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libloader,jfreereport_libloader))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBLOADER_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk
new file mode 100644
index 000000000000..ffe4a4594eb3
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_librepository,jfreereport_librepository))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBREPOSITORY_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk
new file mode 100644
index 000000000000..8a4ad1341d2e
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libserializer,jfreereport_libserializer))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBSERIALIZER_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk
new file mode 100644
index 000000000000..0d21948fab7d
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libxml,jfreereport_libxml))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		-Dbuild.id="10682" \
+		-Dproject.revision="$(LIBXML_VERSION)" \
+		$(if $(debug),-Dbuild.debug="on") jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk
new file mode 100644
index 000000000000..9e5286bfc095
--- /dev/null
+++ b/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac))
+
+$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_sac,jfreereport_sac))
+
+$(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_sac)" && \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		-Dantcontrib.available="true" \
+		$(if $(debug),-Dbuild.debug="on") all && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Makefile b/jfreereport/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/jfreereport/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk
new file mode 100644
index 000000000000..ffaa9429775c
--- /dev/null
+++ b/jfreereport/Module_jfreereport.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,jfreereport))
+
+ifneq ($(SOLAR_JAVA),)
+ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),)
+$(eval $(call gb_Module_add_targets,jfreereport,\
+	UnpackedTarball_jfreereport_sac \
+	ExternalProject_jfreereport_sac \
+	Package_jfreereport_sac \
+	UnpackedTarball_jfreereport_libbase \
+	ExternalProject_jfreereport_libbase \
+	Package_jfreereport_libbase \
+	UnpackedTarball_jfreereport_flute \
+	ExternalProject_jfreereport_flute \
+	Package_jfreereport_flute \
+	UnpackedTarball_jfreereport_libloader \
+	ExternalProject_jfreereport_libloader \
+	Package_jfreereport_libloader \
+	UnpackedTarball_jfreereport_libxml \
+	ExternalProject_jfreereport_libxml \
+	Package_jfreereport_libxml \
+	UnpackedTarball_jfreereport_libformula \
+	ExternalProject_jfreereport_libformula \
+	Package_jfreereport_libformula \
+	UnpackedTarball_jfreereport_libfonts \
+	ExternalProject_jfreereport_libfonts \
+	Package_jfreereport_libfonts \
+	ExternalProject_jfreereport_librepository \
+	UnpackedTarball_jfreereport_librepository \
+	Package_jfreereport_librepository \
+	UnpackedTarball_jfreereport_libserializer \
+	ExternalProject_jfreereport_libserializer \
+	Package_jfreereport_libserializer \
+	UnpackedTarball_jfreereport_liblayout \
+	ExternalProject_jfreereport_liblayout \
+	Package_jfreereport_liblayout \
+	UnpackedTarball_jfreereport_flow_engine \
+	ExternalProject_jfreereport_flow_engine \
+	Package_jfreereport_flow_engine \
+	Package_jfreereport_version \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flow_engine.mk b/jfreereport/Package_jfreereport_flow_engine.mk
new file mode 100644
index 000000000000..eacddb3c1867
--- /dev/null
+++ b/jfreereport/Package_jfreereport_flow_engine.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_flow_engine,$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
+
+$(eval $(call gb_Package_add_file,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/Package_jfreereport_flute.mk
new file mode 100644
index 000000000000..eddb4281e147
--- /dev/null
+++ b/jfreereport/Package_jfreereport_flute.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+
+$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libbase.mk b/jfreereport/Package_jfreereport_libbase.mk
new file mode 100644
index 000000000000..073cce50cb2b
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libbase.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libbase,$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libbase,jfreereport_libbase))
+
+$(eval $(call gb_Package_add_file,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libfonts.mk b/jfreereport/Package_jfreereport_libfonts.mk
new file mode 100644
index 000000000000..22152c019afd
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libfonts.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libfonts,$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libfonts,jfreereport_libfonts))
+
+$(eval $(call gb_Package_add_file,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libformula.mk b/jfreereport/Package_jfreereport_libformula.mk
new file mode 100644
index 000000000000..87538b89cb0f
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libformula.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libformula,$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libformula,jfreereport_libformula))
+
+$(eval $(call gb_Package_add_file,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_liblayout.mk b/jfreereport/Package_jfreereport_liblayout.mk
new file mode 100644
index 000000000000..d06c3a31beb1
--- /dev/null
+++ b/jfreereport/Package_jfreereport_liblayout.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_liblayout,$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
+
+$(eval $(call gb_Package_add_file,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libloader.mk b/jfreereport/Package_jfreereport_libloader.mk
new file mode 100644
index 000000000000..e67c1e46bed7
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libloader.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libloader,$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libloader,jfreereport_libloader))
+
+$(eval $(call gb_Package_add_file,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_librepository.mk b/jfreereport/Package_jfreereport_librepository.mk
new file mode 100644
index 000000000000..ec5f8376d874
--- /dev/null
+++ b/jfreereport/Package_jfreereport_librepository.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_librepository,$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_librepository,jfreereport_librepository))
+
+$(eval $(call gb_Package_add_file,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libserializer.mk b/jfreereport/Package_jfreereport_libserializer.mk
new file mode 100644
index 000000000000..3ac26a9487a8
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libserializer.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libserializer,$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libserializer,jfreereport_libserializer))
+
+$(eval $(call gb_Package_add_file,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libxml.mk b/jfreereport/Package_jfreereport_libxml.mk
new file mode 100644
index 000000000000..6669f331a129
--- /dev/null
+++ b/jfreereport/Package_jfreereport_libxml.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_Package_Package,jfreereport_libxml,$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_libxml,jfreereport_libxml))
+
+$(eval $(call gb_Package_add_file,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_sac.mk b/jfreereport/Package_jfreereport_sac.mk
new file mode 100644
index 000000000000..d4c0f86f9bb5
--- /dev/null
+++ b/jfreereport/Package_jfreereport_sac.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,jfreereport_sac,$(call gb_UnpackedTarball_get_dir,jfreereport_sac)))
+
+$(eval $(call gb_Package_use_external_project,jfreereport_sac,jfreereport_sac))
+
+$(eval $(call gb_Package_add_file,jfreereport_sac,bin/sac.jar,build/lib/sac.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_version.mk b/jfreereport/Package_jfreereport_version.mk
new file mode 100644
index 000000000000..5384d6a7f523
--- /dev/null
+++ b/jfreereport/Package_jfreereport_version.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,jfreereport_version,$(SRCDIR)/jfreereport))
+
+$(eval $(call gb_Package_add_file,jfreereport_version,bin/jfreereport_version.mk,version.mk))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
new file mode 100644
index 000000000000..af4dcd6a25b6
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flow_engine))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flow_engine,$(JFREEREPORT_FLOW_ENGINE_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\
+	build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\
+	jfreereport/patches/flow-engine.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_flute.mk b/jfreereport/UnpackedTarball_jfreereport_flute.mk
new file mode 100644
index 000000000000..9a7ed95c242a
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_flute.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flute))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flute,$(JFREEREPORT_FLUTE_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\
+	jfreereport/patches/common_build.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/jfreereport/UnpackedTarball_jfreereport_libbase.mk
new file mode 100644
index 000000000000..63d2ce3d8525
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_libbase.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\
+	jfreereport/patches/common_build.patch \
+	jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
new file mode 100644
index 000000000000..c471ee03d63d
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libfonts,$(JFREEREPORT_LIBFONTS_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\
+	jfreereport/patches/common_build.patch \
+	jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/jfreereport/UnpackedTarball_jfreereport_libformula.mk
new file mode 100644
index 000000000000..4d5529393a56
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libformula))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libformula,$(JFREEREPORT_LIBFORMULA_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\
+	jfreereport/patches/common_build.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
new file mode 100644
index 000000000000..f91311fb5190
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_liblayout))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_liblayout,$(JFREEREPORT_LIBLAYOUT_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\
+	build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\
+	jfreereport/patches/liblayout.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/jfreereport/UnpackedTarball_jfreereport_libloader.mk
new file mode 100644
index 000000000000..b34d414cb22f
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_libloader.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libloader,$(JFREEREPORT_LIBLOADER_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\
+	jfreereport/patches/common_build.patch \
+	jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/jfreereport/UnpackedTarball_jfreereport_librepository.mk
new file mode 100644
index 000000000000..4262ddc6563f
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_librepository.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_librepository,$(JFREEREPORT_LIBREPOSITORY_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\
+	jfreereport/patches/common_build.patch \
+	jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
new file mode 100644
index 000000000000..6c3992d11ee9
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libserializer))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libserializer,$(JFREEREPORT_LIBSERIALIZER_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\
+	jfreereport/patches/common_build.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/jfreereport/UnpackedTarball_jfreereport_libxml.mk
new file mode 100644
index 000000000000..820eaac2d493
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_libxml.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libxml))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libxml,$(JFREEREPORT_LIBXML_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\
+	common_build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\
+	jfreereport/patches/common_build.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/UnpackedTarball_jfreereport_sac.mk b/jfreereport/UnpackedTarball_jfreereport_sac.mk
new file mode 100644
index 000000000000..2dcfd6484278
--- /dev/null
+++ b/jfreereport/UnpackedTarball_jfreereport_sac.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_sac))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_sac,$(JFREEREPORT_SAC_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,jfreereport/java/sac/build.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
deleted file mode 100644
index 63731fda8997..000000000000
--- a/jfreereport/java/flute/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=flute
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION)
-TARFILE_MD5=d8bd5eed178db6e2b18eeed243f85aa8
-# TARFILE_ROOTDIR=$(TARGET)
-TARFILE_IS_FLAT=true
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
-CONVERTFILES=common_build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-.ENDIF
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.IF "$(L10N_framework)"==""
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar 
-
-$(PACKAGE_DIR)$/$(TARGET).patch : 
-    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(FLUTE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-    
-$(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(FLUTE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar
-.ENDIF
-.ENDIF
-
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
deleted file mode 100644
index af9237661112..000000000000
--- a/jfreereport/java/jfreereport/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=flow-engine
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(FLOW_ENGINE_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=ba2930200c9f019c2d93a8c88c651a0f
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.IF "$(L10N_framework)"==""
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar 
-$(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
deleted file mode 100644
index 54a247ba61f3..000000000000
--- a/jfreereport/java/libbase/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-
-PRJNAME=jfreereport
-TARGET=libbase
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=$(TARGET)-$(LIBBASE_VERSION)
-TARFILE_MD5=eeb2c7ddf0d302fba4bfc6e97eac9624
-#TARFILE_ROOTDIR=$(TARGET)
-TARFILE_IS_FLAT=true
-
-PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBBASE_VERSION)-deprecated.patch
-CONVERTFILES=common_build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.IF "$(L10N_framework)"==""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar
-
-$(PACKAGE_DIR)/$(TARGET).patch :
-	@-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-	( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBBASE_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
-	$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
-
-# XCLASSPATH/CLASSPATH does not work and we only can give lib once. But
-# the build.xmls fortunately take *.jar out of lib so we can copy our
-# commons-logging.jar here - yes, even in the system-apache commons case.
-# Sucks.
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)/commons-logging.jar
-
-$(CLASSDIR)/commons-logging.jar :
-.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-	$(COPY) $(OUTDIR)/bin/commons-logging-1.1.1.jar $(CLASSDIR)/commons-logging.jar
-.ELSE
-	$(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)/commons-logging.jar
-.ENDIF
-
-$(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar : $(CLASSDIR)/commons-logging.jar $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-	$(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBBASE_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
deleted file mode 100644
index 69f181c785d4..000000000000
--- a/jfreereport/java/libfonts/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-
-PRJNAME=jfreereport
-TARGET=libfonts
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=3bdf40c0d199af31923e900d082ca2dd
-PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBFONTS_VERSION)-deprecated.patch
-CONVERTFILES=common_build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar
-
-$(PACKAGE_DIR)/$(TARGET).patch :
-	@-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-	( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
-	$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
-
-$(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-	$(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar
-
-.ENDIF
-.ENDIF
-
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
deleted file mode 100644
index d6f108721ee8..000000000000
--- a/jfreereport/java/libformula/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=libformula
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(LIBFORMULA_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=3404ab6b1792ae5f16bbd603bd1e1d03
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
-CONVERTFILES=common_build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar 
-
-$(PACKAGE_DIR)$/$(TARGET).patch : 
-    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFORMULA_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-    
-$(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFORMULA_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar
-    
-.ENDIF
-# $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : 
-#	@@-$(MKDIRHIER) $(@:d)
-#    $(MV) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/isRef-Function.properties $@	
-.ENDIF
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
deleted file mode 100644
index 92c8a327e07c..000000000000
--- a/jfreereport/java/liblayout/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=liblayout
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(LIBLAYOUT_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=db60e4fde8dd6d6807523deb71ee34dc
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar 
-$(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar
-    
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
deleted file mode 100644
index 811d382d72b9..000000000000
--- a/jfreereport/java/libloader/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-
-PRJNAME=jfreereport
-TARGET=libloader
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=97b2d4dba862397f446b217e2b623e71
-PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBLOADER_VERSION)-deprecated.patch
-CONVERTFILES=common_build.xml
-
-.IF "$(L10N_framework)"==""
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar
-
-$(PACKAGE_DIR)/$(TARGET).patch :
-	@-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-	( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBLOADER_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
-	$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
-
-$(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-	$(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBLOADER_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar
-
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
deleted file mode 100644
index 02d9d96ff918..000000000000
--- a/jfreereport/java/librepository/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-
-PRJNAME=jfreereport
-TARGET=librepository
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=8ce2fcd72becf06c41f7201d15373ed9
-PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBREPOSITORY_VERSION)-deprecated.patch
-CONVERTFILES=common_build.xml
-
-.IF "$(L10N_framework)"==""
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
-
-$(PACKAGE_DIR)/$(TARGET).patch :
-	@-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-	( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBREPOSITORY_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
-	$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
-
-$(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-	$(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBREPOSITORY_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
-
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
deleted file mode 100644
index f92c529138bd..000000000000
--- a/jfreereport/java/libserializer/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=libserializer
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(LIBSERIALIZER_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=f94d9870737518e3b597f9265f4e9803
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
-CONVERTFILES=common_build.xml
-                
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar 
-
-$(PACKAGE_DIR)$/$(TARGET).patch : 
-    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBSERIALIZER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-    
-$(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar
-    
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
deleted file mode 100644
index f225a58140d5..000000000000
--- a/jfreereport/java/libxml/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=libxml
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)-$(LIBXML_VERSION)
-TARFILE_IS_FLAT=true
-TARFILE_MD5=ace6ab49184e329db254e454a010f56d
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
-CONVERTFILES=common_build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar 
-
-$(PACKAGE_DIR)$/$(TARGET).patch : 
-    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBXML_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-    
-$(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBXML_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar
-    
-.ENDIF
-.ENDIF
diff --git a/jfreereport/java/sac/build.xml b/jfreereport/java/sac/build.xml
new file mode 100644
index 000000000000..0e85dff04f3a
--- /dev/null
+++ b/jfreereport/java/sac/build.xml
@@ -0,0 +1,64 @@
+<project name="sac" default="all" basedir=".">
+
+  <!-- Properties -->
+
+  <property name="name" value="sac"/>
+  <property name="src" value="src"/>
+  <property name="build" value="build"/>
+  <property name="build.classes" value="${build}/classes"/>
+  <property name="build.doc" value="${build}/api"/>
+  <property name="build.lib" value="${build}/lib"/>
+  <property name="packagenames" value="org.w3c.css.sac.*"/>
+
+  <!-- Targets -->
+
+  <!-- Prepare build directories -->
+  <target name="prepare">
+    <mkdir dir="${src}"/>
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build.classes}"/>
+    <mkdir dir="${build.lib}"/>
+    <mkdir dir="${build.doc}"/>
+    <copy todir="${src}/org">
+      <fileset dir="org"/>
+    </copy>
+  </target>
+
+  <!-- Kill all the created directories -->
+  <target name="clean">
+    <delete dir="${build}"/>
+    <delete dir="${src}"/>
+  </target>
+
+  <!-- Build classes -->
+  <target name="classes" depends="prepare">
+    <javac srcdir="${src}" destdir="${build.classes}" debug="off" optimize="on"/>
+    <copy todir="${build.classes}">
+      <fileset dir="${src}">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- Build jar archives -->
+  <target name="jar" depends="classes">
+    <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}"/>
+  </target>
+
+  <!-- Build the full JavaDocs -->
+  <target name="javadoc" depends="prepare">
+    <javadoc sourcepath="${src}"
+            destdir="${build.doc}"
+            doctitle="${name} JavaDoc"
+            windowtitle="${name} JavaDoc"
+            package="true"
+            author="true"
+            version="true"
+            packagenames="${packagenames}"
+    />
+  </target>
+
+  <!-- Build everything -->
+  <target name="all" depends="jar,javadoc"/>
+
+</project>
\ No newline at end of file
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
deleted file mode 100644
index 337e752573c0..000000000000
--- a/jfreereport/java/sac/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=jfreereport
-TARGET=sac-1.3
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(L10N_framework)"==""
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
-.INCLUDE : antsettings.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=sacjava-1.3
-TARFILE_MD5=39bb3fcea1514f1369fcfc87542390fd
-
-TARFILE_ROOTDIR=$(TARGET)
-
-PATCH_FILES=$(PRJ)$/patches$/sac.patch
-
-ADDITIONAL_FILES=build.xml
-
-# CONVERTFILES=build.xml
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
-.ELSE
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF # L10N_framework
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-
-ALLTAR : $(CLASSDIR)$/sac.jar
-
-$(CLASSDIR)$/sac.jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/sac.jar $(CLASSDIR)$/sac.jar
-.ENDIF
-.ENDIF # L10N_framework
-
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch
index aef70cb7fef6..ae6864412879 100644
--- a/jfreereport/patches/flow-engine.patch
+++ b/jfreereport/patches/flow-engine.patch
@@ -1,9 +1,10 @@
 --- misc/flow-engine-0.9.4/build.xml	(Revision 6728)
 +++ misc/build/flow-engine-0.9.4/build.xml	(Arbeitskopie)
-@@ -24,6 +24,6 @@
+@@ -24,6 +24,7 @@
    <!-- Setup the compile classpath -->
    <path id="classpath">
 -    <fileset dir="lib">
++    <pathelement path="${commons-logging.jar}"/>
 +    <fileset dir="${lib}">
        <include name="*.jar" />
      </fileset>
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index 4b1c23100987..6da279361f07 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,9 +1,10 @@
 --- misc/liblayout-0.2.10/build.xml	(Revision 6728)
 +++ misc/build/liblayout-0.2.10/build.xml	(Arbeitskopie)
-@@ -24,6 +24,6 @@
+@@ -24,6 +24,7 @@
    <!-- Setup the compile classpath -->
    <path id="classpath">
 -    <fileset dir="lib">
++    <pathelement path="${commons-logging.jar}"/>
 +    <fileset dir="${lib}">
        <include name="*.jar" />
      </fileset>
diff --git a/jfreereport/prj/build.lst b/jfreereport/prj/build.lst
index 62cdd738c3b6..3c5fea8f80e4 100644
--- a/jfreereport/prj/build.lst
+++ b/jfreereport/prj/build.lst
@@ -1,13 +1,2 @@
-jf	jfreereport	:	solenv APACHE_COMMONS:apache-commons NULL
-jf	jfreereport								usr1	-	all	jf_mkout 							NULL
-jf	jfreereport\java\sac					nmake	-	all	jf_sac								NULL
-jf	jfreereport\java\libbase				nmake	-	all	jf_libbase							NULL
-jf	jfreereport\java\flute					nmake	-	all	jf_flute jf_sac						NULL
-jf	jfreereport\java\libloader				nmake	-	all	jf_libloader jf_libbase				NULL
-jf	jfreereport\java\libxml					nmake	-	all	jf_libxml jf_libbase jf_libloader	NULL
-jf	jfreereport\java\libformula				nmake	-	all	jf_libformula jf_libbase 			NULL
-jf	jfreereport\java\libfonts				nmake	-	all	jf_libfonts	jf_libbase jf_libloader NULL
-jf	jfreereport\java\librepository			nmake	-	all	jf_librepository jf_libbase			NULL
-jf	jfreereport\java\libserializer          nmake	-	all	jf_libserializer jf_libbase         NULL
-jf	jfreereport\java\jfreereport			nmake	-	all	jf_jfreereport jf_liblayout jf_libformula jf_libserializer		NULL
-jf	jfreereport\java\liblayout				nmake	-	all	jf_liblayout jf_libbase	jf_flute jf_libfonts jf_libloader jf_librepository jf_libxml jf_sac		NULL
+jf	jfreereport :           solenv APACHE_COMMONS:apache-commons NULL
+jf	jfreereport\prj	        nmake	-	all	jf_sac	NULL
diff --git a/jfreereport/prj/dmake b/jfreereport/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/jfreereport/prj/dmake
+++ /dev/null
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 1874ebf63b75..bb0dc572e044 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL