diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
| commit | eb358d77291eba677141bab113dc27d7aabb0f3e (patch) | |
| tree | 2e96f3b5d0c79beaeb536bbf05c3b8564846e65f /ridljar/Jar_unoloader.mk | |
| parent | Adding debian version 4:24.2.1-4. (diff) | |
| download | libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.tar.xz libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.zip | |
Merging upstream version 4:24.2.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ridljar/Jar_unoloader.mk')
| -rw-r--r-- | ridljar/Jar_unoloader.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk index 2acf20b5b2..b7fcbc105d 100644 --- a/ridljar/Jar_unoloader.mk +++ b/ridljar/Jar_unoloader.mk @@ -14,13 +14,13 @@ $(eval $(call gb_Jar_set_packageroot,unoloader,com)) $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest)) # the module-info.class is manually added here since it's not in "com" dir -$(eval $(call gb_Jar_add_packagedirs,unoloader,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_packagedirs,unoloader,\ $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \ -)) +))) -$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ ridljar/source/unoloader/module-info \ -)) +))) $(eval $(call gb_Jar_add_sourcefiles,unoloader,\ ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \ |