diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-14 18:08:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-14 18:11:55 +0200 |
| commit | a382dad6afefdfc14b5d0c891ddbec149328de3d (patch) | |
| tree | 0d2a0be8f0d25c7a04d3b6309c7b3aa682bb9b6a /scp2/source/ooo/ure.scp | |
| parent | 1d0e18703523139e5fd6d11b6f3d72bb0b368036 (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 'scp2/source/ooo/ure.scp')
| -rw-r--r-- | scp2/source/ooo/ure.scp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index a1f76461aa03..a1b14c66347e 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -282,12 +282,10 @@ End #endif #if defined ENABLE_JAVA && defined MACOSX -Unixlink gid_Unixlink_Dl_JavaUno - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = "libjava_uno.jnilib"; - Target = "libjava_uno.dylib"; - Styles = (); +File gid_File_bridges_jnilib_java_uno + Dir = FILELIST_DIR; + Name = "bridges_jnilib_java_uno.filelist"; + Styles = (FILELIST); End #endif @@ -638,6 +636,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Profile_Uno, gid_Unixlink_File_Dl_Rmcxt, gid_File_Dl_JrepropertiesClass, + gid_File_bridges_jnilib_java_uno, gid_File_ure_install, gid_File_Dl_Jpipe, gid_File_Dl_Jpipx, @@ -657,8 +656,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Misc_TypesRdb, gid_File_Misc_ServicesRdb, gid_File_Misc_JavavendorsXml); - Unixlinks = (gid_Unixlink_Dl_JavaUno, - gid_Unixlink_File_Dl_Sal, + Unixlinks = (gid_Unixlink_File_Dl_Sal, gid_Unixlink_File_Dl_Salhelper, gid_Unixlink_File_Dl_Cppu, gid_Unixlink_File_Dl_Cppuhelper, |