Index: native-src/linux.IA32/archive/makefile =================================================================== --- native-src/linux.IA32/archive/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/linux.IA32/archive/makefile 2006-03-05 21:07:39.000000000 +0000 @@ -20,9 +20,9 @@ CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist -I../zip -I../fdlibm -BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o zip.o \ - $(SHAREDSUB)adler32.o inflater.o jarfile.o deflater.o \ - $(SHAREDSUB)archiveglob.o +BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \ + $(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \ + $(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o MDLLIBFILES = \ ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \ Index: native-src/linux.IA32/common/makefile =================================================================== --- native-src/linux.IA32/common/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/linux.IA32/common/makefile 2006-03-05 21:08:12.000000000 +0000 @@ -19,7 +19,8 @@ include ../makefile.include CFLAGS += -I../zlib -I../zip -I../fdlibm -BUILDFILES = $(SHAREDSUB)libglob.o iohelp.o utf8encode.o utf8decode.o +BUILDFILES = $(SHAREDSUB)libglob.o $(SHAREDSUB)iohelp.o \ + $(SHAREDSUB)utf8encode.o $(SHAREDSUB)utf8decode.o LIBNAME = $(LIBPATH)libhycommon.a include ../rules.mk Index: native-src/linux.IA32/launcher/makefile =================================================================== --- native-src/linux.IA32/launcher/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/linux.IA32/launcher/makefile 2006-03-05 21:08:32.000000000 +0000 @@ -18,8 +18,9 @@ include ../makefile.include -BUILDFILES = main.o cmain.o $(SHAREDSUB)launcher_copyright.o \ - $(SHAREDSUB)strbuf.o $(SHAREDSUB)libhlp.o +BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \ + $(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \ + $(SHAREDSUB)libhlp.o MDLLIBFILES = ../libhyprt.so ../libhythr.so EXENAME = $(EXEPATH)java Index: native-src/linux.IA32/luni/makefile =================================================================== --- native-src/linux.IA32/luni/makefile.orig 2006-03-05 11:54:28.000000000 +0000 +++ native-src/linux.IA32/luni/makefile 2006-03-05 21:09:38.000000000 +0000 @@ -24,12 +24,12 @@ $(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \ $(SHAREDSUB)oos.o $(SHAREDSUB)fileis.o \ simpl.o $(SHAREDSUB)psimpl2.o nethelp.o $(SHAREDSUB)floatbits.o \ - $(SHAREDSUB)rafile.o $(SHAREDSUB)ois.o helpers.o math.o luniglob.o \ - $(SHAREDSUB)proxy.o $(SHAREDSUB)netif.o process.o bigint.o \ - $(SHAREDSUB)osc.o socket.o inetadds.o $(SHAREDSUB)pssimpl.o \ - $(SHAREDSUB)filedesc.o $(SHAREDSUB)timezone.o $(SHAREDSUB)pmsimpl.o \ - pdsimpl.o $(SHAREDSUB)fileos.o \ - $(SHAREDSUB)OSFileSystem.o OSFileSystemLinux32.o \ + $(SHAREDSUB)rafile.o $(SHAREDSUB)ois.o helpers.o $(SHAREDSUB)math.o \ + $(SHAREDSUB)luniglob.o $(SHAREDSUB)proxy.o $(SHAREDSUB)netif.o \ + process.o $(SHAREDSUB)bigint.o $(SHAREDSUB)osc.o $(SHAREDSUB)socket.o \ + $(SHAREDSUB)inetadds.o $(SHAREDSUB)pssimpl.o $(SHAREDSUB)filedesc.o \ + $(SHAREDSUB)timezone.o $(SHAREDSUB)pmsimpl.o pdsimpl.o \ + $(SHAREDSUB)fileos.o $(SHAREDSUB)OSFileSystem.o OSFileSystemLinux32.o \ OSMemory.o OSMemoryLinux32.o OSNetworkSystem.o MDLLIBFILES = \ Index: native-src/linux.IA32/math/makefile =================================================================== --- native-src/linux.IA32/math/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/linux.IA32/math/makefile 2006-03-05 21:09:54.000000000 +0000 @@ -22,7 +22,7 @@ BUILDFILES = \ $(SHAREDSUB)math_copyright.o $(SHAREDSUB)fltparse.o \ - $(SHAREDSUB)mathglob.o $(SHAREDSUB)dblparse.o bigint.o \ + $(SHAREDSUB)mathglob.o $(SHAREDSUB)dblparse.o $(SHAREDSUB)bigint.o \ $(SHAREDSUB)cbigint.o MDLLIBFILES = \ Index: native-src/linux.IA32/pool/makefile =================================================================== --- native-src/linux.IA32/pool/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/linux.IA32/pool/makefile 2006-03-05 21:10:19.000000000 +0000 @@ -18,7 +18,7 @@ include ../makefile.include -BUILDFILES = pool.o $(SHAREDSUB)pool_cap.o +BUILDFILES = $(SHAREDSUB)pool.o $(SHAREDSUB)pool_cap.o LIBNAME = $(LIBPATH)libhypool.a include ../rules.mk Index: native-src/linux.IA32/port/makefile =================================================================== --- native-src/linux.IA32/port/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/linux.IA32/port/makefile 2006-03-05 21:11:00.000000000 +0000 @@ -24,11 +24,11 @@ $(SHAREDSUB)port_copyright.o hycpu.o $(SHAREDSUB)hyerror.o \ hyerrorhelpers.o $(SHAREDSUB)hyexit.o hyfile.o hyfiletext.o \ $(SHAREDSUB)hygp.o hyipcmutex.o hymem.o \ - hymmap.o hynls.o hynlshelpers.o hyosdump.o hyport.o \ - $(SHAREDSUB)hyportcontrol.o hyportptb.o hysharedhelper.o hyshmem.o \ - hyshsem.o hysignal.o hysl.o hysock.o hystr.o $(SHAREDSUB)hystrftime.o \ - $(SHAREDSUB)hystsl.o hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o \ - hytty.o hyvmem.o + hymmap.o $(SHAREDSUB)hynls.o hynlshelpers.o hyosdump.o \ + $(SHAREDSUB)hyport.o $(SHAREDSUB)hyportcontrol.o hyportptb.o \ + hysharedhelper.o hyshmem.o hyshsem.o hysignal.o hysl.o hysock.o \ + $(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 Index: native-src/win.IA32/archive/makefile =================================================================== --- native-src/win.IA32/archive/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/archive/makefile 2006-03-05 21:11:30.000000000 +0000 @@ -27,8 +27,9 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def BUILDFILES = \ - $(SHAREDSUB)archive_copyright.obj $(SHAREDSUB)jclcrc32.obj zip.obj \ - $(SHAREDSUB)adler32.obj inflater.obj jarfile.obj deflater.obj \ + $(SHAREDSUB)archive_copyright.obj $(SHAREDSUB)jclcrc32.obj \ + $(SHAREDSUB)zip.obj $(SHAREDSUB)adler32.obj $(SHAREDSUB)inflater.obj \ + $(SHAREDSUB)jarfile.obj $(SHAREDSUB)deflater.obj \ $(SHAREDSUB)archiveglob.obj VIRTFILES = $(LIBBASE).res Index: native-src/win.IA32/common/makefile =================================================================== --- native-src/win.IA32/common/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/common/makefile 2006-03-05 21:12:04.000000000 +0000 @@ -22,8 +22,9 @@ LIBNAME=$(LIBPATH)hycommon.lib BUILDFILES = \ - $(SHAREDSUB)libglob.obj iohelp.obj locklbl.obj lock386.obj \ - utf8decode.obj utf8encode.obj + $(SHAREDSUB)libglob.obj $(SHAREDSUB)iohelp.obj \ + locklbl.obj lock386.obj \ + $(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\zip /I..\fdlibm Index: native-src/win.IA32/launcher/makefile.javae =================================================================== --- native-src/win.IA32/launcher/makefile.javae.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/launcher/makefile.javae 2006-03-05 21:12:43.000000000 +0000 @@ -22,8 +22,8 @@ EXENAME=$(EXEPATH)java.exe HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) -BUILDFILES = $(SHAREDSUB)launcher_copyright.obj cmain.obj main.obj \ - $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj +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 EXEFLAGS=$(conlflags) -subsystem:console Index: native-src/win.IA32/launcher/makefile.javaw =================================================================== --- native-src/win.IA32/launcher/makefile.javaw.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/launcher/makefile.javaw 2006-03-05 21:13:02.000000000 +0000 @@ -20,8 +20,8 @@ SHAREDSUB=$(SHARED)launcher\# comment to avoid \ being treated as continuation EXENAME=$(EXEPATH)javaw.exe -BUILDFILES = $(SHAREDSUB)launcher_copyright.obj main.obj winmain.obj \ - $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj +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 EXEFLAGS=$(guilflags) -subsystem:windows Index: native-src/win.IA32/luni/makefile =================================================================== --- native-src/win.IA32/luni/makefile.orig 2006-03-05 11:54:28.000000000 +0000 +++ native-src/win.IA32/luni/makefile 2006-03-05 21:14:30.000000000 +0000 @@ -30,13 +30,14 @@ $(SHAREDSUB)luni_copyright.obj $(SHAREDSUB)file.obj procimpl.obj \ $(SHAREDSUB)oos.obj $(SHAREDSUB)fileis.obj simpl.obj \ $(SHAREDSUB)psimpl2.obj nethelp.obj $(SHAREDSUB)floatbits.obj \ - $(SHAREDSUB)rafile.obj $(SHAREDSUB)ois.obj helpers.obj math.obj \ - luniglob.obj $(SHAREDSUB)proxy.obj $(SHAREDSUB)netif.obj process.obj \ - bigint.obj $(SHAREDSUB)osc.obj socket.obj inetadds.obj \ - $(SHAREDSUB)pssimpl.obj $(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj \ - $(SHAREDSUB)pmsimpl.obj pdsimpl.obj $(SHAREDSUB)fileos.obj \ - OSFileSystemWin32.obj $(SHAREDSUB)OSFileSystem.obj OSMemoryWin32.obj \ - OSMemory.obj OSNetworkSystem.obj OSNetworkSystemWin32.obj + $(SHAREDSUB)rafile.obj $(SHAREDSUB)ois.obj helpers.obj $(SHAREDSUB)math.obj \ + $(SHAREDSUB)luniglob.obj $(SHAREDSUB)proxy.obj $(SHAREDSUB)netif.obj \ + process.obj $(SHAREDSUB)bigint.obj $(SHAREDSUB)osc.obj \ + $(SHAREDSUB)socket.obj $(SHAREDSUB)inetadds.obj $(SHAREDSUB)pssimpl.obj \ + $(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj $(SHAREDSUB)pmsimpl.obj \ + pdsimpl.obj $(SHAREDSUB)fileos.obj OSFileSystemWin32.obj \ + $(SHAREDSUB)OSFileSystem.obj OSMemoryWin32.obj OSMemory.obj \ + OSNetworkSystem.obj OSNetworkSystemWin32.obj VIRTFILES = hyluni.res Index: native-src/win.IA32/math/makefile =================================================================== --- native-src/win.IA32/math/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/math/makefile 2006-03-05 21:14:42.000000000 +0000 @@ -27,7 +27,7 @@ BUILDFILES = \ $(SHAREDSUB)math_copyright.obj $(SHAREDSUB)fltparse.obj \ - $(SHAREDSUB)mathglob.obj $(SHAREDSUB)dblparse.obj bigint.obj \ + $(SHAREDSUB)mathglob.obj $(SHAREDSUB)dblparse.obj $(SHAREDSUB)bigint.obj \ $(SHAREDSUB)cbigint.obj VIRTFILES = $(LIBBASE).res Index: native-src/win.IA32/pool/makefile =================================================================== --- native-src/win.IA32/pool/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/pool/makefile 2006-03-05 21:14:53.000000000 +0000 @@ -20,6 +20,6 @@ SHAREDSUB=$(SHARED)pool\# comment to avoid \ being treated as continuation LIBNAME=$(LIBPATH)hypool.lib -BUILDFILES = pool.obj $(SHAREDSUB)pool_cap.obj +BUILDFILES = $(SHAREDSUB)pool.obj $(SHAREDSUB)pool_cap.obj !include <..\rules.mak> Index: native-src/win.IA32/port/makefile =================================================================== --- native-src/win.IA32/port/makefile.orig 2006-03-02 11:50:41.000000000 +0000 +++ native-src/win.IA32/port/makefile 2006-03-05 21:15:33.000000000 +0000 @@ -29,11 +29,12 @@ BUILDFILES = \ $(SHAREDSUB)port_copyright.obj hycpu.obj $(SHAREDSUB)hyerror.obj \ hyerrorhelpers.obj $(SHAREDSUB)hyexit.obj hyfile.obj hyfiletext.obj \ - $(SHAREDSUB)hygp.obj hyipcmutex.obj hymem.obj hymmap.obj hynls.obj \ - hynlshelpers.obj hyosdump.obj hyport.obj $(SHAREDSUB)hyportcontrol.obj \ - hyportptb.obj hyshmem.obj hyshsem.obj hysignal.obj hysl.obj hysock.obj \ - hystr.obj $(SHAREDSUB)hystrftime.obj $(SHAREDSUB)hystsl.obj hysysinfo.obj \ - hytime.obj $(SHAREDSUB)hytlshelpers.obj hytty.obj hyvmem.obj + $(SHAREDSUB)hygp.obj hyipcmutex.obj hymem.obj hymmap.obj \ + $(SHAREDSUB)hynls.obj hynlshelpers.obj hyosdump.obj $(SHAREDSUB)hyport.obj \ + $(SHAREDSUB)hyportcontrol.obj hyportptb.obj hyshmem.obj hyshsem.obj \ + hysignal.obj hysl.obj hysock.obj $(SHAREDSUB)hystr.obj \ + $(SHAREDSUB)hystrftime.obj $(SHAREDSUB)hystsl.obj hysysinfo.obj hytime.obj \ + $(SHAREDSUB)hytlshelpers.obj hytty.obj hyvmem.obj VIRTFILES = hyprt.res