From a382dad6afefdfc14b5d0c891ddbec149328de3d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 14 Sep 2013 18:08:57 +0200 Subject: 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 --- RepositoryFixes.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'RepositoryFixes.mk') 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 -- cgit v1.2.3