You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/12 18:18:55 UTC
svn commit: r413700 - in /incubator/harmony/enhanced/classlib/trunk:
modules/luni/make/common/ native-src/ native-src/linux.IA32/
native-src/linux.IA32/archive/ native-src/linux.IA32/auth/
native-src/linux.IA32/lib/ native-src/linux.IA32/luni/ native-s...
Author: hindessm
Date: Mon Jun 12 09:18:53 2006
New Revision: 413700
URL: http://svn.apache.org/viewvc?rev=413700&view=rev
Log:
Applying changes from "HARMONY-596 Make .lib/.a files build into deploy/lib"
Removed:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/lib/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/lib/
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml Mon Jun 12 09:18:53 2006
@@ -107,6 +107,8 @@
<fileset dir="${hy.luni.src.test.java}">
<include name="**/*Test.java" />
+ <exclude name="tests/api/java/lang/IllegalThreadStateExceptionTest.java" />
+ <exclude name="tests/api/java/lang/ThreadTest.java" />
<exclude name="tests/api/java/io/InputStreamReaderTest.java" />
<exclude name="tests/api/java/io/ObjectInputStreamTest.java" />
<exclude name="tests/api/java/io/ObjectOutputStreamTest.java" />
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Mon Jun 12 09:18:53 2006
@@ -43,7 +43,7 @@
target: clean
================================= -->
<target name="clean"
- depends="clean-overlay-oss, make-clean, clean-includes, clean-layout" />
+ depends="make-clean, clean-includes, clean-overlay-oss, clean-layout" />
<!-- =================================
@@ -58,6 +58,7 @@
<property name="build.output" location="../native-bin/${target.platform}" />
<property name="native.src.root" location="${basedir}/${target.platform}" />
<property name="native.shared.src.root" location="${basedir}/shared" />
+ <property name="native.lib.target" location="${hy.hdk}/lib" />
<property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
<property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
@@ -105,6 +106,8 @@
<!-- This target invokes make on the all target to compile all natives -->
<target name="make-all" depends="properties">
+ <mkdir dir="${native.lib.target}"/>
+
<exec failonerror="true"
executable="${make.command}"
dir="${target.platform}">
@@ -125,6 +128,7 @@
<arg line="clean" />
</exec>
+ <delete dir="${native.lib.target}" />
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile Mon Jun 12 09:18:53 2006
@@ -26,8 +26,8 @@
$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
MDLLIBFILES = \
- ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
- ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+ ../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so $(LIBPATH)libhycommon.a \
+ $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
DLLNAME=../libhyarchive.so
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile Mon Jun 12 09:18:53 2006
@@ -21,8 +21,8 @@
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
MDLLIBFILES = \
- ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
- ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+ ../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so $(LIBPATH)libhycommon.a \
+ $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
DLLNAME = ../libhyauth.so
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile Mon Jun 12 09:18:53 2006
@@ -36,8 +36,8 @@
OSNetworkSystemLinux.o
MDLLIBFILES = \
- ../lib/libhycommon.a ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so \
- ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+ $(LIBPATH)libhycommon.a ../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so \
+ $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
DLLNAME = ../libhyluni.so
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include Mon Jun 12 09:18:53 2006
@@ -24,8 +24,7 @@
CXX_DLL_LD = $(CXX)
EXEPATH=../
-#DEPLOY=../../../deploy/
-LIBPATH=../lib/
+LIBPATH=$(HY_HDK)/lib/
SHARED=../../shared/
SHAREDSUB=$(SHARED)$(notdir $(CURDIR))/
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile Mon Jun 12 09:18:53 2006
@@ -31,7 +31,7 @@
$(SHAREDSUB)hystr.o $(SHAREDSUB)hystrftime.o $(SHAREDSUB)hystsl.o \
hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o hyvmem.o
-MDLLIBFILES = ../libhythr.so ../lib/libhycommon.a ../libhysig.so
+MDLLIBFILES = ../libhythr.so $(LIBPATH)libhycommon.a ../libhysig.so
DLLNAME = ../libhyprt.so
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile Mon Jun 12 09:18:53 2006
@@ -23,8 +23,8 @@
MDLLIBFILES = \
unicode/libicuuc.so.34 \
- ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
- ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+ ../libhysig.so $(LIBPATH)libhyzip.a ../libhyzlib.so $(LIBPATH)libhycommon.a \
+ $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a ../libhythr.so ../libvmi.so
DLLNAME = ../libhytext.so
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile Mon Jun 12 09:18:53 2006
@@ -26,7 +26,7 @@
$(SHAREDSUB)rwmutex.o thrcreate.o thrdsup.o $(SHAREDSUB)thrprof.o
SYSLIBFILES = -lpthread
-MDLLIBFILES = ../lib/libhypool.a ../lib/libhycommon.a
+MDLLIBFILES = $(LIBPATH)libhypool.a $(LIBPATH)libhycommon.a
DLLNAME = ../libhythr.so
include ../rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile Mon Jun 12 09:18:53 2006
@@ -20,7 +20,7 @@
CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
-MDLLIBFILES = ../lib/libhyzip.a ../lib/libhypool.a
+MDLLIBFILES = $(LIBPATH)libhyzip.a $(LIBPATH)libhypool.a
DLLNAME = ../libvmi.so
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile Mon Jun 12 09:18:53 2006
@@ -37,9 +37,9 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = \
- ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib \
- ..\lib\hyzlib.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
- ..\lib\hythr.lib ..\lib\vmi.lib
+ $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib \
+ $(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
+ $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
DLLBASE=0x13100000
!include <..\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile Mon Jun 12 09:18:53 2006
@@ -28,9 +28,9 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib \
- ..\lib\hyzlib.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
- ..\lib\hythr.lib ..\lib\vmi.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
DLLBASE=0x1300000
COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable."
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak Mon Jun 12 09:18:53 2006
@@ -4,8 +4,7 @@
SEHMAP = TRUE
!include <win32.mak>
-#DEPLOY=..\..\..\deploy\# comment to avoid \ being treated as continuation
-LIBPATH=..\lib\# ditto
+LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
EXEPATH=..\# ditto
DLLPATH=..\# ditto
SHARED=..\..\shared\# ditto
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile Mon Jun 12 09:18:53 2006
@@ -51,12 +51,12 @@
$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
$(LIBPATH)$(LIBNAME): $(BUILDFILES)
- @echo /NOLOGO -out:$(LIBPATH)$(LIBNAME) >templrf
+ @echo /NOLOGO -out:$(LIBNAME) >templrf
@echo $(BUILDFILES) >>templrf
$(implib) @templrf
@del templrf
clean:
-del *.obj dist\*.obj
- -del $(LIBPATH)$(LIBNAME)
+ -del $(LIBNAME)
-del $(LIBPATH)hyfdlibm.pdb
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae Mon Jun 12 09:18:53 2006
@@ -25,7 +25,7 @@
BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
$(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
VIRTFILES = java.res
-MDLLIBFILES = ..\lib\hyprt.lib ..\lib\hythr.lib
+MDLLIBFILES = $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib
EXEFLAGS=$(conlflags) -subsystem:console
EXEDLLFILES=$(conlibsdll)
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw Mon Jun 12 09:18:53 2006
@@ -23,7 +23,7 @@
BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
VIRTFILES = javaw.res
-MDLLIBFILES = ..\lib\hyprt.lib ..\lib\hythr.lib
+MDLLIBFILES = $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib
EXEFLAGS=$(guilflags) -subsystem:windows
EXEDLLFILES=$(guilibsdll)
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile Mon Jun 12 09:18:53 2006
@@ -45,8 +45,8 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
MDLLIBFILES = \
- ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib \
- ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
+ $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
+ $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
DLLBASE=0x13200000
COMMENT=/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable."
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile Mon Jun 12 09:18:53 2006
@@ -42,7 +42,7 @@
Delayimp.lib -delayload:shell32.dll -delayload:Iphlpapi.dll \
ws2_32.lib Iphlpapi.lib shell32.lib
-MDLLIBFILES = ..\lib\hythr.lib ..\lib\hycommon.lib ..\lib\hysig.lib
+MDLLIBFILES = $(LIBPATH)hythr.lib $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib
DLLBASE=0x11100000
COMMENT=/comment:"Platform port library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile Mon Jun 12 09:18:53 2006
@@ -32,9 +32,9 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = \
- ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib \
- ..\lib\hyzlib.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
- ..\lib\hythr.lib ..\lib\vmi.lib
+ $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib \
+ $(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
+ $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
DLLBASE=0x13300000
COMMENT=/comment:"Preferences component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile Mon Jun 12 09:18:53 2006
@@ -29,8 +29,8 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = \
- ..\lib\hysig.lib ..\lib\hycommon.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
- ..\lib\hythr.lib ..\lib\vmi.lib unicode\icuuc.lib
+ $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
+ $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib unicode\icuuc.lib
DLLBASE=0x13300000
COMMENT=/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile?rev=413700&r1=413699&r2=413700&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile Mon Jun 12 09:18:53 2006
@@ -33,7 +33,7 @@
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-MDLLIBFILES = ..\lib\hypool.lib ..\lib\hycommon.lib
+MDLLIBFILES = $(LIBPATH)hypool.lib $(LIBPATH)hycommon.lib
DLLBASE=0x11500000
COMMENT=/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."