From commits-return-52434-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Fri Jul 27 16:59:58 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id A7C9E180657 for ; Fri, 27 Jul 2018 16:59:57 +0200 (CEST) Received: (qmail 89442 invoked by uid 500); 27 Jul 2018 14:59:56 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 89433 invoked by uid 99); 27 Jul 2018 14:59:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jul 2018 14:59:56 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 427363A012D for ; Fri, 27 Jul 2018 14:59:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1836838 - /openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Date: Fri, 27 Jul 2018 14:59:56 -0000 To: commits@openoffice.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180727145956.427363A012D@svn01-us-west.apache.org> Author: jim Date: Fri Jul 27 14:59:56 2018 New Revision: 1836838 URL: http://svn.apache.org/viewvc?rev=1836838&view=rev Log: Force .jnilibs to be folded in. Patch via Damjan. NOTE: AUXTARGETS is there to add additional targets that must/should delivered w/ the original libs. Good Tribal Knowledge Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1836838&r1=1836837&r2=1836838&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Fri Jul 27 14:59:56 2018 @@ -387,6 +387,9 @@ $(call gb_Library_get_target,$(1)) \ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \ $(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR) endif +$(call gb_Library_get_target,$(1)) \ +$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \ + $(patsubst %.dylib,%.jnilib,$(call gb_Library_get_target,$(1))) endef