summaryrefslogtreecommitdiff
path: root/ridljar/Jar_libreoffice.mk
diff options
context:
space:
mode:
Diffstat (limited to 'ridljar/Jar_libreoffice.mk')
-rw-r--r--ridljar/Jar_libreoffice.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk
index 4d0f5ef2545f..d34ae3f5ebda 100644
--- a/ridljar/Jar_libreoffice.mk
+++ b/ridljar/Jar_libreoffice.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Jar_Jar,libreoffice))
+$(eval $(call gb_Jar_Jar,libreoffice,org.libreoffice.uno))
$(eval $(call gb_Jar_use_customtargets,libreoffice,\
ridljar/javamaker \
@@ -27,9 +27,15 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \
$(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
))
+# ugly: the module-info.class is manually added here since it's not in "com" dir
$(eval $(call gb_Jar_add_packagedirs,libreoffice,\
$(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
$(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
+ $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\
+ ridljar/source/libreoffice/module-info \
))
$(eval $(call gb_Jar_add_sourcefiles,libreoffice,\