odk/settings/std.mk | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 690a1aa9dcf8ce98ec7f96a5980b571566152865
Author: Zenaan Harkness <z...@freedbms.net>
Date: Mon Aug 22 21:58:36 2016 +1000
java extensions makefile - generify
See http://listarchives.libreoffice.org/global/users/msg49357.html
odk/settings/std.mk currently adds each .class file separately,
therefore having to be updated manually any time one class or
anonymous class is added, removed etc.; all the .class files in
com/sun/star/lib/loader/ are needed in the jar anyway, so use a
generic makefile rule.
Change-Id: I3819ab94e2c056220993971de44408e46a4559ed
Reviewed-on: https://gerrit.libreoffice.org/28317
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 4cabe70..ac2d4aa 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -82,12 +82,5 @@ JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
SDK_JAVA_UNO_BOOTSTRAP_FILES=\
- -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
- -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
- -C $(CLASSES_DIR)
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
- -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
- -C $(CLASSES_DIR)
$(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
- -C $(CLASSES_DIR)
$(SQM)com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class$(SQM) \
- -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKey.class$(SQM) \
- -C $(CLASSES_DIR)
$(SQM)com/sun/star/lib/loader/WinRegKeyException.class$(SQM) \
+ -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/$(SQM) \
-C $(CLASSES_DIR) $(SQM)win/unowinreg.dll$(SQM)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
