diff options
| author | Zenaan Harkness <zen@freedbms.net> | 2016-08-22 21:58:36 +1000 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-08-23 08:45:27 +0000 |
| commit | 690a1aa9dcf8ce98ec7f96a5980b571566152865 (patch) | |
| tree | 017ea9a101b634a821a752f3528215babbad0934 /odk | |
| parent | 21385d204995b5c8f5d5fbdfd8a845785e916595 (diff) | |
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 <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/std.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 4cabe7010fb0..ac2d4aa7f397 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) |