harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
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 GMT
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."



Mime
View raw message