summaryrefslogtreecommitdiff
path: root/RepositoryFixes.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-14 18:08:57 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-14 18:11:55 +0200
commita382dad6afefdfc14b5d0c891ddbec149328de3d (patch)
tree0d2a0be8f0d25c7a04d3b6309c7b3aa682bb9b6a /RepositoryFixes.mk
parent1d0e18703523139e5fd6d11b6f3d72bb0b368036 (diff)
Clean up Mac OS X .jnilibs
Those .jnilibs that are not needed as .dylibs (this includes those that are also UNO components) are handled via RepositoryFixes.mk. The remaining one, libjava_uno.jnilib is packaged as a symlink in instdir. Everything else is not necessary and removed (including the venerable oddity macosx-create-bundle). Change-Id: I34a1801b0733cdff885c1c72db16fa631c5d82ef
Diffstat (limited to 'RepositoryFixes.mk')
-rw-r--r--RepositoryFixes.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bc991bcc58ce..df735f1b9dce 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -31,6 +31,16 @@ endif
gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES))
+# fixes for .jnilibs on Mac OS X that are not also needed as .dylibs:
+ifeq ($(OS),MACOSX)
+gb_Library_FILENAMES := \
+ $(subst jpipe:libjpipe.dylib,jpipe:libjpipe.jnilib,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := \
+ $(subst juh:libjuh.dylib,juh:libjuh.jnilib,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := \
+ $(subst hsqldb:libhsqldb.dylib,hsqldb:libhsqldb.jnilib,$(gb_Library_FILENAMES))
+endif
+
# fixes for all the libraries that are named with too much creativity and do
# not follow any of the established nameschemes