Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 57868 invoked from network); 19 Feb 2007 13:24:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Feb 2007 13:24:24 -0000 Received: (qmail 3084 invoked by uid 500); 19 Feb 2007 13:24:32 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 3067 invoked by uid 500); 19 Feb 2007 13:24:32 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 3058 invoked by uid 99); 19 Feb 2007 13:24:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Feb 2007 05:24:32 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Feb 2007 05:24:21 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8F1491A981A; Mon, 19 Feb 2007 05:24:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r509194 - in /harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument: unix/makefile windows/makefile Date: Mon, 19 Feb 2007 13:24:01 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070219132401.8F1491A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Mon Feb 19 05:24:00 2007 New Revision: 509194 URL: http://svn.apache.org/viewvc?view=rev&rev=509194 Log: Make MDLLIBFILES to use the value in defines.{mk,mak} rather than replace it. Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile?view=diff&rev=509194&r1=509193&r2=509194 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile (original) +++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile Mon Feb 19 05:24:00 2007 @@ -24,10 +24,10 @@ BUILDFILES = \ ../shared/instrument.o ../shared/inst_agt.o -MDLLIBFILES = \ - $(LIBPATH)libhycommon.a $(LIBPATH)libhyzip.a \ +MDLLIBFILES += \ + $(LIBPATH)libhyzip.a \ $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \ - $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so + $(LIBPATH)libvmi.so DLLNAME = ../libhyinstrument.so EXPNAME = HYINSTRUMENT_0.1 Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile?view=diff&rev=509194&r1=509193&r2=509194 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile (original) +++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile Mon Feb 19 05:24:00 2007 @@ -32,9 +32,9 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib -MDLLIBFILES = \ - $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \ - $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib +MDLLIBFILES = $(MDLLIBFILES) \ + $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \ + $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib DLLBASE=0x13200000 COMMENT=/comment:"instrument component native code. (c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable."