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 /jurt | |
| 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 'jurt')
| -rw-r--r-- | jurt/CustomTarget_jnilib.mk | 22 | ||||
| -rw-r--r-- | jurt/Module_jurt.mk | 7 | ||||
| -rw-r--r-- | jurt/Package_jnilib.mk | 14 |
3 files changed, 0 insertions, 43 deletions
diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk deleted file mode 100644 index dafd12ecf143..000000000000 --- a/jurt/CustomTarget_jnilib.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,jurt/util)) - -$(eval $(call gb_CustomTarget_register_targets,jurt/util,\ - libjpipe.jnilib \ -)) - -# TODO: could this be replaced by defining library jpipe as gb_Library_Bundle? -$(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1) - cp $< $(dir $@)$(notdir $<) && \ - $(SOLARENV)/bin/macosx-create-bundle $(dir $@)$(notdir $<) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 92b870fa882c..89fb3973c687 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -16,13 +16,6 @@ $(eval $(call gb_Module_add_targets,jurt,\ Library_jpipe \ )) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Module_add_targets,jurt,\ - CustomTarget_jnilib \ - Package_jnilib \ -)) -endif - ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,jurt,\ Library_jpipx \ diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk deleted file mode 100644 index 757e585e29ee..000000000000 --- a/jurt/Package_jnilib.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,jurt_jnilib,$(call gb_CustomTarget_get_workdir,jurt/util))) - -$(eval $(call gb_Package_add_file,jurt_jnilib,lib/$(basename $(call gb_Library_get_filename,jpipe)).jnilib,libjpipe.jnilib)) - -# vim:set noet sw=4 ts=4: |