diff options
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk (renamed from jfreereport/ExternalPackage_jfreereport_flow_engine.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_flute.mk (renamed from jfreereport/ExternalPackage_jfreereport_flute.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_libbase.mk (renamed from jfreereport/ExternalPackage_jfreereport_libbase.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_libfonts.mk (renamed from jfreereport/ExternalPackage_jfreereport_libfonts.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_libformula.mk (renamed from jfreereport/ExternalPackage_jfreereport_libformula.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_liblayout.mk (renamed from jfreereport/ExternalPackage_jfreereport_liblayout.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_libloader.mk (renamed from jfreereport/ExternalPackage_jfreereport_libloader.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_librepository.mk (renamed from jfreereport/ExternalPackage_jfreereport_librepository.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_libserializer.mk (renamed from jfreereport/ExternalPackage_jfreereport_libserializer.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_libxml.mk (renamed from jfreereport/ExternalPackage_jfreereport_libxml.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalPackage_jfreereport_sac.mk (renamed from jfreereport/ExternalPackage_jfreereport_sac.mk) | 0 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk (renamed from jfreereport/ExternalProject_jfreereport_flow_engine.mk) | 0 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flute.mk (renamed from jfreereport/ExternalProject_jfreereport_flute.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_libbase.mk (renamed from jfreereport/ExternalProject_jfreereport_libbase.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_libfonts.mk (renamed from jfreereport/ExternalProject_jfreereport_libfonts.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_libformula.mk (renamed from jfreereport/ExternalProject_jfreereport_libformula.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_liblayout.mk (renamed from jfreereport/ExternalProject_jfreereport_liblayout.mk) | 0 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_libloader.mk (renamed from jfreereport/ExternalProject_jfreereport_libloader.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_librepository.mk (renamed from jfreereport/ExternalProject_jfreereport_librepository.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_libserializer.mk (renamed from jfreereport/ExternalProject_jfreereport_libserializer.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_libxml.mk (renamed from jfreereport/ExternalProject_jfreereport_libxml.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_sac.mk (renamed from jfreereport/ExternalProject_jfreereport_sac.mk) | 0 | ||||
-rw-r--r-- | external/jfreereport/Makefile (renamed from jfreereport/Makefile) | 2 | ||||
-rw-r--r-- | external/jfreereport/Module_jfreereport.mk (renamed from jfreereport/Module_jfreereport.mk) | 4 | ||||
-rw-r--r-- | external/jfreereport/README (renamed from jfreereport/README) | 0 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk (renamed from jfreereport/UnpackedTarball_jfreereport_flow_engine.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_flute.mk (renamed from jfreereport/UnpackedTarball_jfreereport_flute.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_libbase.mk (renamed from jfreereport/UnpackedTarball_jfreereport_libbase.mk) | 6 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk (renamed from jfreereport/UnpackedTarball_jfreereport_libfonts.mk) | 6 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_libformula.mk (renamed from jfreereport/UnpackedTarball_jfreereport_libformula.mk) | 4 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk (renamed from jfreereport/UnpackedTarball_jfreereport_liblayout.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_libloader.mk (renamed from jfreereport/UnpackedTarball_jfreereport_libloader.mk) | 6 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_librepository.mk (renamed from jfreereport/UnpackedTarball_jfreereport_librepository.mk) | 6 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk (renamed from jfreereport/UnpackedTarball_jfreereport_libserializer.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_libxml.mk (renamed from jfreereport/UnpackedTarball_jfreereport_libxml.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/UnpackedTarball_jfreereport_sac.mk (renamed from jfreereport/UnpackedTarball_jfreereport_sac.mk) | 2 | ||||
-rw-r--r-- | external/jfreereport/java/sac/build.xml (renamed from jfreereport/java/sac/build.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/flute/nbproject/project.xml (renamed from jfreereport/nbprojects/flute/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml (renamed from jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/jfreereport/nbproject/project.xml (renamed from jfreereport/nbprojects/jfreereport/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/libfonts/nbproject/project.xml (renamed from jfreereport/nbprojects/libfonts/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/libformula/nbproject/project.xml (renamed from jfreereport/nbprojects/libformula/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/liblayout/nbproject/project.xml (renamed from jfreereport/nbprojects/liblayout/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/libloader/nbproject/project.xml (renamed from jfreereport/nbprojects/libloader/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/librepository/nbproject/project.xml (renamed from jfreereport/nbprojects/librepository/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/nbprojects/libxml/nbproject/project.xml (renamed from jfreereport/nbprojects/libxml/nbproject/project.xml) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/common_build.patch (renamed from jfreereport/patches/common_build.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/flow-engine.patch (renamed from jfreereport/patches/flow-engine.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/libbase-1.1.6-deprecated.patch (renamed from jfreereport/patches/libbase-1.1.6-deprecated.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/libfonts-1.1.6-deprecated.patch (renamed from jfreereport/patches/libfonts-1.1.6-deprecated.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/libformula-time-notz.patch (renamed from jfreereport/patches/libformula-time-notz.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/liblayout.patch (renamed from jfreereport/patches/liblayout.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/libloader-1.1.6-deprecated.patch (renamed from jfreereport/patches/libloader-1.1.6-deprecated.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/librepository-1.1.6-deprecated.patch (renamed from jfreereport/patches/librepository-1.1.6-deprecated.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/patches/sac.patch (renamed from jfreereport/patches/sac.patch) | 0 | ||||
-rw-r--r-- | external/jfreereport/version.mk (renamed from jfreereport/version.mk) | 0 |
58 files changed, 40 insertions, 44 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f4c30554ccba..fe4fc94ebb59 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ instsetoo_native \ io \ javaunohelper \ - $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,JPEG,jpeg) \ jurt \ jvmaccess \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 26b93ad61d38..6764ac4126b3 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,HUNSPELL,hunspell) \ $(call gb_Helper_optional,HYPHEN,hyphen) \ $(call gb_Helper_optional,ICU,icu) \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk index 00e8ded5743d..1482967b91c0 100644 --- a/jfreereport/ExternalPackage_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) diff --git a/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk index 2892342d90c4..f0196a8c9052 100644 --- a/jfreereport/ExternalPackage_jfreereport_flute.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flute.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) diff --git a/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk index ee42a44c8fec..0f6ee51d93fa 100644 --- a/jfreereport/ExternalPackage_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) diff --git a/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk index fd89ded99c2b..c097e76bf50c 100644 --- a/jfreereport/ExternalPackage_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) diff --git a/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk index 674d4b27397e..4e4266ca4033 100644 --- a/jfreereport/ExternalPackage_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) diff --git a/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk index 84f56369e8f2..fc19dd1554fb 100644 --- a/jfreereport/ExternalPackage_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) diff --git a/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk index 3a8c1fd170c2..01f1bcc62b09 100644 --- a/jfreereport/ExternalPackage_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) diff --git a/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk index 4a671d512a5e..4103811ba3ee 100644 --- a/jfreereport/ExternalPackage_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) diff --git a/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk index 4202856041a3..f576ed7b3d14 100644 --- a/jfreereport/ExternalPackage_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) diff --git a/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk index 1db31f44959e..6425911a42cb 100644 --- a/jfreereport/ExternalPackage_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) diff --git a/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk index 1f8df20e4db6..1f8df20e4db6 100644 --- a/jfreereport/ExternalPackage_jfreereport_sac.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_sac.mk diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 08b86134cedc..08b86134cedc 100644 --- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk index 90e59d650ea7..f2a559c649ef 100644 --- a/jfreereport/ExternalProject_jfreereport_flute.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk index 0f1c2acabbef..8f1ec0884777 100644 --- a/jfreereport/ExternalProject_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk index 0982ed766c66..ad38cd98ca18 100644 --- a/jfreereport/ExternalProject_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk index 9523a0f04177..90d8b4d7da8f 100644 --- a/jfreereport/ExternalProject_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index cddbef1d32ed..cddbef1d32ed 100644 --- a/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk index 6b3c01b0a24e..2b860b8aa7a6 100644 --- a/jfreereport/ExternalProject_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk index 4f1a50e56ad2..21611e45ccd9 100644 --- a/jfreereport/ExternalProject_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk index 6bc29f7359ac..2b0c951a7227 100644 --- a/jfreereport/ExternalProject_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk index c7340d51a233..0cb2d7e38a5b 100644 --- a/jfreereport/ExternalProject_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk index 72783a175317..72783a175317 100644 --- a/jfreereport/ExternalProject_jfreereport_sac.mk +++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk diff --git a/jfreereport/Makefile b/external/jfreereport/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/jfreereport/Makefile +++ b/external/jfreereport/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Module_jfreereport.mk b/external/jfreereport/Module_jfreereport.mk index f2a40f91c15a..5a4431ecc4da 100644 --- a/jfreereport/Module_jfreereport.mk +++ b/external/jfreereport/Module_jfreereport.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Module_Module,jfreereport)) -ifneq ($(ENABLE_JAVA),) -ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,jfreereport,\ ExternalPackage_jfreereport_flow_engine \ ExternalPackage_jfreereport_flute \ @@ -46,7 +44,5 @@ $(eval $(call gb_Module_add_targets,jfreereport,\ UnpackedTarball_jfreereport_libxml \ UnpackedTarball_jfreereport_sac \ )) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/jfreereport/README b/external/jfreereport/README index 228577060d83..228577060d83 100644 --- a/jfreereport/README +++ b/external/jfreereport/README diff --git a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk index af4dcd6a25b6..f6640e46f775 100644 --- a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ - jfreereport/patches/flow-engine.patch \ + external/jfreereport/patches/flow-engine.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_flute.mk b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk index 9a7ed95c242a..a972e21aabc0 100644 --- a/jfreereport/UnpackedTarball_jfreereport_flute.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\ - jfreereport/patches/common_build.patch \ + external/jfreereport/patches/common_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk index 63d2ce3d8525..c3ba35190ede 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libbase.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk index c471ee03d63d..b648c58bbef8 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk index 8dabfffe854e..2bc3229e54f7 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libformula.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk @@ -16,8 +16,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libformula-time-notz.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libformula-time-notz.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk index f91311fb5190..7281ba59b353 100644 --- a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\ - jfreereport/patches/liblayout.patch \ + external/jfreereport/patches/liblayout.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk index b34d414cb22f..7357ddd03ad9 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libloader.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk index 4262ddc6563f..86ff991b9f3e 100644 --- a/jfreereport/UnpackedTarball_jfreereport_librepository.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk @@ -8,7 +8,7 @@ # # for VERSION -include $(SRCDIR)/jfreereport/version.mk +include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository)) @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\ - jfreereport/patches/common_build.patch \ - jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk index 6c3992d11ee9..22d6d0cb7a2a 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\ - jfreereport/patches/common_build.patch \ + external/jfreereport/patches/common_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk index 820eaac2d493..ceca692adee2 100644 --- a/jfreereport/UnpackedTarball_jfreereport_libxml.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\ )) $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\ - jfreereport/patches/common_build.patch \ + external/jfreereport/patches/common_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_sac.mk b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk index 2dcfd6484278..eb951663db4c 100644 --- a/jfreereport/UnpackedTarball_jfreereport_sac.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk @@ -11,6 +11,6 @@ $(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)) +$(eval $(call gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,external/jfreereport/java/sac/build.xml)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/java/sac/build.xml b/external/jfreereport/java/sac/build.xml index 0e85dff04f3a..0e85dff04f3a 100644 --- a/jfreereport/java/sac/build.xml +++ b/external/jfreereport/java/sac/build.xml diff --git a/jfreereport/nbprojects/flute/nbproject/project.xml b/external/jfreereport/nbprojects/flute/nbproject/project.xml index 4280b91022ab..4280b91022ab 100644 --- a/jfreereport/nbprojects/flute/nbproject/project.xml +++ b/external/jfreereport/nbprojects/flute/nbproject/project.xml diff --git a/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml index f7a14ae8712f..f7a14ae8712f 100644 --- a/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml +++ b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml diff --git a/jfreereport/nbprojects/jfreereport/nbproject/project.xml b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml index 8f6074cfb8d8..8f6074cfb8d8 100644 --- a/jfreereport/nbprojects/jfreereport/nbproject/project.xml +++ b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml diff --git a/jfreereport/nbprojects/libfonts/nbproject/project.xml b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml index d84bfb7f832b..d84bfb7f832b 100644 --- a/jfreereport/nbprojects/libfonts/nbproject/project.xml +++ b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml diff --git a/jfreereport/nbprojects/libformula/nbproject/project.xml b/external/jfreereport/nbprojects/libformula/nbproject/project.xml index e056200ee16e..e056200ee16e 100644 --- a/jfreereport/nbprojects/libformula/nbproject/project.xml +++ b/external/jfreereport/nbprojects/libformula/nbproject/project.xml diff --git a/jfreereport/nbprojects/liblayout/nbproject/project.xml b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml index 63ad9ef3f420..63ad9ef3f420 100644 --- a/jfreereport/nbprojects/liblayout/nbproject/project.xml +++ b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml diff --git a/jfreereport/nbprojects/libloader/nbproject/project.xml b/external/jfreereport/nbprojects/libloader/nbproject/project.xml index 6b06d5686759..6b06d5686759 100644 --- a/jfreereport/nbprojects/libloader/nbproject/project.xml +++ b/external/jfreereport/nbprojects/libloader/nbproject/project.xml diff --git a/jfreereport/nbprojects/librepository/nbproject/project.xml b/external/jfreereport/nbprojects/librepository/nbproject/project.xml index c1b92593de3f..c1b92593de3f 100644 --- a/jfreereport/nbprojects/librepository/nbproject/project.xml +++ b/external/jfreereport/nbprojects/librepository/nbproject/project.xml diff --git a/jfreereport/nbprojects/libxml/nbproject/project.xml b/external/jfreereport/nbprojects/libxml/nbproject/project.xml index 6b966c904cd3..6b966c904cd3 100644 --- a/jfreereport/nbprojects/libxml/nbproject/project.xml +++ b/external/jfreereport/nbprojects/libxml/nbproject/project.xml diff --git a/jfreereport/patches/common_build.patch b/external/jfreereport/patches/common_build.patch index 2bc54595cf17..2bc54595cf17 100644 --- a/jfreereport/patches/common_build.patch +++ b/external/jfreereport/patches/common_build.patch diff --git a/jfreereport/patches/flow-engine.patch b/external/jfreereport/patches/flow-engine.patch index 86f50a3999df..86f50a3999df 100644 --- a/jfreereport/patches/flow-engine.patch +++ b/external/jfreereport/patches/flow-engine.patch diff --git a/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch index da28c30eb70e..da28c30eb70e 100644 --- a/jfreereport/patches/libbase-1.1.6-deprecated.patch +++ b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch diff --git a/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch index eb2ab8c76c10..eb2ab8c76c10 100644 --- a/jfreereport/patches/libfonts-1.1.6-deprecated.patch +++ b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch diff --git a/jfreereport/patches/libformula-time-notz.patch b/external/jfreereport/patches/libformula-time-notz.patch index fec65b17e1a6..fec65b17e1a6 100644 --- a/jfreereport/patches/libformula-time-notz.patch +++ b/external/jfreereport/patches/libformula-time-notz.patch diff --git a/jfreereport/patches/liblayout.patch b/external/jfreereport/patches/liblayout.patch index 035d99bd3b96..035d99bd3b96 100644 --- a/jfreereport/patches/liblayout.patch +++ b/external/jfreereport/patches/liblayout.patch diff --git a/jfreereport/patches/libloader-1.1.6-deprecated.patch b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch index c098906fcf70..c098906fcf70 100644 --- a/jfreereport/patches/libloader-1.1.6-deprecated.patch +++ b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch diff --git a/jfreereport/patches/librepository-1.1.6-deprecated.patch b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch index a266efc4bb79..a266efc4bb79 100644 --- a/jfreereport/patches/librepository-1.1.6-deprecated.patch +++ b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch diff --git a/jfreereport/patches/sac.patch b/external/jfreereport/patches/sac.patch index 77db8511acbe..77db8511acbe 100644 --- a/jfreereport/patches/sac.patch +++ b/external/jfreereport/patches/sac.patch diff --git a/jfreereport/version.mk b/external/jfreereport/version.mk index 4156932d87c7..4156932d87c7 100644 --- a/jfreereport/version.mk +++ b/external/jfreereport/version.mk |