harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r381003 - in /incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32: archive/ auth/ common/ fdlibm/ jsig/ launcher/ lib/ luni/ math/ nio/ pool/ port/ sig/ text/ thread/ vmi/ zip/ zlib/
Date Sat, 25 Feb 2006 22:01:22 GMT
Author: tellison
Date: Sat Feb 25 14:01:20 2006
New Revision: 381003

URL: http://svn.apache.org/viewcvs?rev=381003&view=rev
Log:
Apply patch HARMONY-128 (windows makefile housekeeping)

Removed:
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/jsig/
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/lib/j9fdlibm.pdb
Modified:
    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/common/makefile
    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/math/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -33,42 +33,36 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\archive /I..\common /I..\zlib\dist /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\archive /I..\common /I..\zlib\dist /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd  $(VMASMDEBUG) -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = archive_copyright.obj jclcrc32.obj zip.obj adler32.obj inflater.obj
-BUILDFILES2 = jarfile.obj deflater.obj archiveglob.obj
-
-VIRTFILES1 = hyarchive.res
+BUILDFILES = \
+	archive_copyright.obj jclcrc32.obj zip.obj adler32.obj inflater.obj \
+	jarfile.obj deflater.obj archiveglob.obj
 
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
+VIRTFILES = hyarchive.res
 
-MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib
-MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+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
 
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+all: $(DLLNAME)
 
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(implib) /nologo -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /nologo -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 -machine:$(CPU) \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 -machine:$(CPU) \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) \
-	$(SYSLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) \
+	$(SYSLIBFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -32,45 +32,33 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -Zi -WX  /I..\include /I..\auth $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -Zi -WX /I..\include /I..\auth $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32   $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = auth_copyright.obj authwin32.obj
+BUILDFILES = auth_copyright.obj authwin32.obj
 
-VIRTFILES1 = hyauth.res
+VIRTFILES = hyauth.res
 
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib
-MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.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
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+all: $(DLLNAME)
 	
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
 	/comment:"Auth component native code. (c) Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable." \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) $(SYSLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile Sat Feb 25 14:01:20 2006
@@ -10,44 +10,38 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Makefile for module 'common'
-#
-
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
-
-LIBNAME=hycommon.lib# declaration
-
-LIBPATH=..\lib\# declaration
-
-BUILDFILES1 = libglob.obj iohelp.obj locklbl.obj lock386.obj utf8decode.obj utf8encode.obj
-
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES1 = ..\lib\hysig.lib ..\lib\hypool.lib
-MDLLIBFILES2 = ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hycommon.pdb /I..\include /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
-
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hycommon.pdb /I..\include /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd  $(VMASMDEBUG) -DWIN32  $<
-
-all: $(LIBPATH)$(LIBNAME)
-
-$(LIBPATH)$(LIBNAME): $(BUILDFILES1) 
-	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES1)
-
-clean:
-	-del *.obj
-	-del ..\lib\$(LIBNAME)
-	-del ..\lib\hycommon.pdb
+# limitations under the License.
+
+#
+# Makefile for module 'common'
+#
+
+APPVER=4.0
+TARGETOS=WIN95
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+LIBNAME=hycommon.lib# declaration
+
+LIBPATH=..\lib\# declaration
+
+BUILDFILES = \
+	libglob.obj iohelp.obj locklbl.obj lock386.obj \
+	utf8decode.obj utf8encode.obj
+
+.c.obj:
+	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hycommon.pdb /I..\include /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
+
+.asm.obj:
+	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd  $(VMASMDEBUG) -DWIN32  $<
+
+all: $(LIBPATH)$(LIBNAME)
+
+$(LIBPATH)$(LIBNAME): $(BUILDFILES) 
+	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES)
+
+clean:
+	-del *.obj
+	-del ..\lib\$(LIBNAME)
+	-del ..\lib\hycommon.pdb

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -25,56 +25,36 @@
 
 LIBPATH=..\lib\# declaration
 
-BUILDFILES1 = dist/e_acos.obj dist/e_acosh.obj dist/e_asin.obj dist/e_atan2.obj dist/e_atanh.obj
-BUILDFILES2 = dist/e_cosh.obj dist/e_exp.obj dist/e_fmod.obj dist/e_gamma.obj dist/e_gamma_r.obj
-BUILDFILES3 = dist/e_hypot.obj dist/e_j0.obj dist/e_j1.obj dist/e_jn.obj dist/e_lgamma.obj
-BUILDFILES4 = dist/e_lgamma_r.obj dist/e_log.obj dist/e_log10.obj dist/e_pow.obj dist/e_rem_pio2.obj
-BUILDFILES5 = dist/e_remainder.obj dist/e_scalb.obj dist/e_sinh.obj dist/e_sqrt.obj dist/k_cos.obj
-BUILDFILES6 = dist/k_rem_pio2.obj dist/k_sin.obj dist/k_standard.obj dist/k_tan.obj dist/s_asinh.obj
-BUILDFILES7 = dist/s_atan.obj dist/s_cbrt.obj dist/s_ceil.obj dist/s_copysign.obj dist/s_cos.obj
-BUILDFILES8 = dist/s_erf.obj dist/s_expm1.obj dist/s_fabs.obj dist/s_finite.obj dist/s_floor.obj
-BUILDFILES9 = dist/s_frexp.obj dist/s_ilogb.obj dist/s_isnan.obj dist/s_ldexp.obj s_lib_version.obj
-BUILDFILES10 = dist/s_log1p.obj dist/s_logb.obj dist/s_matherr.obj dist/s_modf.obj dist/s_nextafter.obj
-BUILDFILES11 = dist/s_rint.obj dist/s_scalbn.obj dist/s_signgam.obj dist/s_significand.obj dist/s_sin.obj
-BUILDFILES12 = dist/s_tan.obj dist/s_tanh.obj dist/w_acos.obj dist/w_acosh.obj dist/w_asin.obj
-BUILDFILES13 = dist/w_atan2.obj dist/w_atanh.obj dist/w_cosh.obj dist/w_exp.obj dist/w_fmod.obj
-BUILDFILES14 = dist/w_gamma.obj dist/w_gamma_r.obj dist/w_hypot.obj dist/w_j0.obj dist/w_j1.obj
-BUILDFILES15 = dist/w_jn.obj dist/w_lgamma.obj dist/w_lgamma_r.obj dist/w_log.obj dist/w_log10.obj
-BUILDFILES16 = dist/w_pow.obj dist/w_remainder.obj dist/w_scalb.obj dist/w_sinh.obj dist/w_sqrt.obj
+BUILDFILES = \
+  dist/e_acos.obj dist/e_acosh.obj dist/e_asin.obj dist/e_atan2.obj \
+  dist/e_atanh.obj dist/e_cosh.obj dist/e_exp.obj dist/e_fmod.obj \
+  dist/e_gamma.obj dist/e_gamma_r.obj dist/e_hypot.obj dist/e_j0.obj \
+  dist/e_j1.obj dist/e_jn.obj dist/e_lgamma.obj dist/e_lgamma_r.obj \
+  dist/e_log.obj dist/e_log10.obj dist/e_pow.obj dist/e_rem_pio2.obj \
+  dist/e_remainder.obj dist/e_scalb.obj dist/e_sinh.obj dist/e_sqrt.obj \
+  dist/k_cos.obj dist/k_rem_pio2.obj dist/k_sin.obj dist/k_standard.obj \
+  dist/k_tan.obj dist/s_asinh.obj dist/s_atan.obj dist/s_cbrt.obj \
+  dist/s_ceil.obj dist/s_copysign.obj dist/s_cos.obj dist/s_erf.obj \
+  dist/s_expm1.obj dist/s_fabs.obj dist/s_finite.obj dist/s_floor.obj \
+  dist/s_frexp.obj dist/s_ilogb.obj dist/s_isnan.obj dist/s_ldexp.obj \
+  s_lib_version.obj dist/s_log1p.obj dist/s_logb.obj dist/s_matherr.obj \
+  dist/s_modf.obj dist/s_nextafter.obj dist/s_rint.obj dist/s_scalbn.obj \
+  dist/s_signgam.obj dist/s_significand.obj dist/s_sin.obj dist/s_tan.obj \
+  dist/s_tanh.obj dist/w_acos.obj dist/w_acosh.obj dist/w_asin.obj \
+  dist/w_atan2.obj dist/w_atanh.obj dist/w_cosh.obj dist/w_exp.obj \
+  dist/w_fmod.obj dist/w_gamma.obj dist/w_gamma_r.obj dist/w_hypot.obj \
+  dist/w_j0.obj dist/w_j1.obj dist/w_jn.obj dist/w_lgamma.obj \
+  dist/w_lgamma_r.obj dist/w_log.obj dist/w_log10.obj dist/w_pow.obj \
+  dist/w_remainder.obj dist/w_scalb.obj dist/w_sinh.obj dist/w_sqrt.obj
 
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Oityb1 -Gs -GF -Zm400 -W3 -Zi -Fd$(LIBPATH)hyfdlibm.pdb  -D_IEEE_LIBM -DHY_PLATFORM_DOUBLE_ORDER /I..\include /I. $(VMDEBUG) -Fo$*.obj $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Oityb1 -Gs -GF -Zm400 -W3 -Zi -Fd$(LIBPATH)hyfdlibm.pdb  -D_IEEE_LIBM -DHY_PLATFORM_DOUBLE_ORDER /I..\include $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32   $<
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(BUILDFILES7) $(BUILDFILES8) $(BUILDFILES9) $(BUILDFILES10) \
-	$(BUILDFILES11) $(BUILDFILES12) $(BUILDFILES13) $(BUILDFILES14) $(BUILDFILES15) \
-	$(BUILDFILES16) 
+$(LIBPATH)$(LIBNAME): $(BUILDFILES)
 	@echo /NOLOGO -out:$(LIBPATH)$(LIBNAME) >templrf
-	@echo $(BUILDFILES1) >>templrf
-	@echo $(BUILDFILES2) >>templrf
-	@echo $(BUILDFILES3) >>templrf
-	@echo $(BUILDFILES4) >>templrf
-	@echo $(BUILDFILES5) >>templrf
-	@echo $(BUILDFILES6) >>templrf
-	@echo $(BUILDFILES7) >>templrf
-	@echo $(BUILDFILES8) >>templrf
-	@echo $(BUILDFILES9) >>templrf
-	@echo $(BUILDFILES10) >>templrf
-	@echo $(BUILDFILES11) >>templrf
-	@echo $(BUILDFILES12) >>templrf
-	@echo $(BUILDFILES13) >>templrf
-	@echo $(BUILDFILES14) >>templrf
-	@echo $(BUILDFILES15) >>templrf
-	@echo $(BUILDFILES16) >>templrf
+	@echo $(BUILDFILES) >>templrf
 	$(implib) @templrf
 	@del templrf
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -27,28 +27,23 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd -DWIN32  $<
-
 .rc.res:
 	rc -I../include $<
 
-BUILDFILES1 = launcher_copyright.obj cmain.obj main.obj strbuf.obj libhlp.obj
+BUILDFILES = launcher_copyright.obj cmain.obj main.obj strbuf.obj libhlp.obj
 
-VIRTFILES1 = java.res
+VIRTFILES = java.res
 
-MDLLIBFILES1 = ..\lib\hyprt.lib ..\lib\hythr.lib 
+MDLLIBFILES = ..\lib\hyprt.lib ..\lib\hythr.lib 
 
 all: $(EXENAME)
 
-$(EXENAME):\
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1)
-	link /NOLOGO $(conlflags) /debug /opt:icf /opt:ref $(VMLINK) -out:$(EXENAME) -subsystem:console -machine:$(CPU) setargv.obj  $(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) $(conlibsdll) 
+$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	link /NOLOGO $(conlflags) /debug /opt:icf /opt:ref $(VMLINK) \
+	-out:$(EXENAME) -subsystem:console -machine:$(CPU) setargv.obj  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(conlibsdll) 
 
 clean:
-	-del ..\java.exe
+	-del $(EXENAME)
 	-del ..\java.pdb
 	-del java.RES

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -27,29 +27,24 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -W3 -Zi  /I..\include $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -W3 -Zi  /I..\include $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = launcher_copyright.obj main.obj winmain.obj strbuf.obj libhlp.obj
+BUILDFILES = launcher_copyright.obj main.obj winmain.obj strbuf.obj libhlp.obj
 
-VIRTFILES1 = javaw.res
+VIRTFILES = javaw.res
 
-MDLLIBFILES1 =  ..\lib\hyprt.lib ..\lib\hythr.lib 
+MDLLIBFILES =  ..\lib\hyprt.lib ..\lib\hythr.lib 
 
 all: $(EXENAME)
 
-$(EXENAME):\
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1)
-	link /NOLOGO $(guilflags) /debug /opt:icf /opt:ref $(VMLINK) -out:$(EXENAME) -subsystem:windows -machine:$(CPU) setargv.obj  $(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) $(guilibsdll) 
+$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	link /NOLOGO $(guilflags) /debug /opt:icf /opt:ref $(VMLINK) \
+	-out:$(EXENAME) -subsystem:windows -machine:$(CPU) setargv.obj \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(guilibsdll) 
 
 clean:
-	-del ..\javaw.exe
+	-del $(EXENAME)
 	-del ..\javaw.pdb
 	-del javaw.RES
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -33,50 +33,38 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\luni /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\luni /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd  $(VMASMDEBUG) -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = luni_copyright.obj file.obj procimpl.obj oos.obj fileis.obj
-BUILDFILES2 = simpl.obj psimpl2.obj nethelp.obj floatbits.obj rafile.obj
-BUILDFILES3 = ois.obj helpers.obj math.obj luniglob.obj proxy.obj
-BUILDFILES4 = netif.obj process.obj bigint.obj osc.obj socket.obj
-BUILDFILES5 = inetadds.obj pssimpl.obj filedesc.obj timezone.obj pmsimpl.obj
-BUILDFILES6 = pdsimpl.obj fileos.obj
-
-VIRTFILES1 = hyluni.res
+BUILDFILES = \
+  luni_copyright.obj file.obj procimpl.obj oos.obj fileis.obj simpl.obj \
+  psimpl2.obj nethelp.obj floatbits.obj rafile.obj ois.obj helpers.obj \
+  math.obj luniglob.obj proxy.obj netif.obj process.obj bigint.obj osc.obj \
+  socket.obj inetadds.obj pssimpl.obj filedesc.obj timezone.obj pmsimpl.obj \
+  pdsimpl.obj fileos.obj
 
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
+VIRTFILES = hyluni.res
 
-MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib
-MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+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
 
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+all: $(DLLNAME)
 
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13200000 -machine:$(CPU) \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13200000 -machine:$(CPU) \
 	/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable." \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) $(SYSLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 clean:
@@ -88,4 +76,3 @@
 	-del ..\lib\$(LIBNAME).exp
 	-del ..\$(LIBNAME).pdb
 	-del $(DLLNAME)
-	

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile Sat Feb 25 14:01:20 2006
@@ -10,75 +10,67 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Makefile for module 'math'
-#
-
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
-
-DLLFILENAME=hymath.dll# declaration
-
-DLLNAME=..\hymath.dll# declaration
-
-LIBNAME=hymath# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\math /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
-
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\math /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd  $(VMASMDEBUG) -DWIN32  $<
-
-.rc.res:
-	rc -I..\include $<
-
-BUILDFILES1 = math_copyright.obj fltparse.obj mathglob.obj dblparse.obj bigint.obj
-BUILDFILES2 = cbigint.obj
-
-VIRTFILES1 = hymath.res
-
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib
-MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
-
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
-
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
-	/comment:"Math component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) \
-	$(SYSLIBFILES1)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
-	
+# limitations under the License.
+
+#
+# Makefile for module 'math'
+#
+
+APPVER=4.0
+TARGETOS=WIN95
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+DLLFILENAME=hymath.dll# declaration
+
+DLLNAME=..\hymath.dll# declaration
+
+LIBNAME=hymath# declaration
+
+LIBPATH=..\lib\# declaration
+
+.c.obj:
+	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\math /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
+
+.rc.res:
+	rc -I..\include $<
+
+BUILDFILES = \
+  math_copyright.obj fltparse.obj mathglob.obj dblparse.obj bigint.obj \
+  cbigint.obj
+
+VIRTFILES = hymath.res
+
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
+  ..\lib\hythr.lib ..\lib\vmi.lib
+
+all: $(DLLNAME)
+
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
+
+
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
+	/comment:"Math component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable." \
+	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) \
+	$(SYSLIBFILES)  \
+	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
+
+clean:
+	-del *.map
+	-del *.obj
+	-del *.res
+	-del *.pdb
+	-del ..\lib\$(LIBNAME).lib
+	-del ..\lib\$(LIBNAME).exp
+	-del ..\$(LIBNAME).pdb
+	-del $(DLLNAME)

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile Sat Feb 25 14:01:20 2006
@@ -32,46 +32,36 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -Zi -WX  /I..\include /I..\nio /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -Zi -WX /I..\include /I..\nio /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32   $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = nio_copyright.obj OSFileSystemWin32.obj OSFileSystem.obj OSMemoryWin32.obj OSMemory.obj
-BUILDFILES2 = nethelp.obj helpers.obj socket.obj OSNetworkSystem.obj OSNetworkSystemWin32.obj
+BUILDFILES = \
+  nio_copyright.obj OSFileSystemWin32.obj OSFileSystem.obj OSMemoryWin32.obj \
+  OSMemory.obj nethelp.obj helpers.obj socket.obj OSNetworkSystem.obj \
+  OSNetworkSystemWin32.obj
 
-VIRTFILES1 = hynio.res
+VIRTFILES = hynio.res
 
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib Mswsock.lib
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
 
-MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib
-MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.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
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+all: $(DLLNAME)
 	
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
 	/comment:"NIO component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable." \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) $(SYSLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile Sat Feb 25 14:01:20 2006
@@ -26,21 +26,15 @@
 
 LIBPATH=..\lib\# declaration
 
-BUILDFILES1 = pool.obj pool_cap.obj
+BUILDFILES = pool.obj pool_cap.obj
 
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hypool.pdb /I..\include  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hypool.pdb /I..\include  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME): $(BUILDFILES1) 
-	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES1)
+$(LIBPATH)$(LIBNAME): $(BUILDFILES) 
+	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-del *.obj

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -33,50 +33,38 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  -DHYPORT_LIBRARY_DEFINE /I..\include $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  -DHYPORT_LIBRARY_DEFINE /I..\include $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = port_copyright.obj hycpu.obj hyerror.obj hyerrorhelpers.obj hyexit.obj
-BUILDFILES2 = hyfile.obj hyfiletext.obj hygp.obj hyipcmutex.obj hymem.obj
-BUILDFILES3 = hymmap.obj hynls.obj hynlshelpers.obj hyosdump.obj hyport.obj
-BUILDFILES4 = hyportcontrol.obj hyportptb.obj hyshmem.obj hyshsem.obj hysignal.obj
-BUILDFILES5 = hysl.obj hysock.obj hystr.obj hystrftime.obj hystsl.obj
-BUILDFILES6 = hysysinfo.obj hytime.obj hytlshelpers.obj hytty.obj hyvmem.obj
-
-VIRTFILES1 = hyprt.res
+BUILDFILES = \
+  port_copyright.obj hycpu.obj hyerror.obj hyerrorhelpers.obj hyexit.obj \
+  hyfile.obj hyfiletext.obj hygp.obj hyipcmutex.obj hymem.obj hymmap.obj \
+  hynls.obj hynlshelpers.obj hyosdump.obj hyport.obj hyportcontrol.obj \
+  hyportptb.obj hyshmem.obj hyshsem.obj hysignal.obj hysl.obj hysock.obj \
+  hystr.obj hystrftime.obj hystsl.obj hysysinfo.obj hytime.obj \
+  hytlshelpers.obj hytty.obj hyvmem.obj
 
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib shell32.lib
+VIRTFILES = hyprt.res
 
-MDLLIBFILES1 = ..\lib\hythr.lib ..\lib\hycommon.lib ..\lib\hysig.lib
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib shell32.lib
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+MDLLIBFILES = ..\lib\hythr.lib ..\lib\hycommon.lib ..\lib\hysig.lib
 
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+all: $(DLLNAME)
 
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) 
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
+	/NOLOGO -entry:_DllMainCRTStartup@12 \
          -dll /BASE:0x11100000 -machine:$(CPU) \
 	/comment:"Platform port library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable." \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map Delayimp.lib -delayload:shell32.dll -delayload:Iphlpapi.dll \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(VIRTFILES1) $(MDLLIBFILES1) $(SYSLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 clean:

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile Sat Feb 25 14:01:20 2006
@@ -33,34 +33,27 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = hysig_copyright.obj hysigwin.obj
-
-VIRTFILES1 = hysig.res
-
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+BUILDFILES = hysig_copyright.obj hysigwin.obj
 
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+VIRTFILES = hysig.res
 
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(VIRTFILES1) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(VIRTFILES1) 
+all: $(DLLNAME)
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(VIRTFILES1) 
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 -machine:$(CPU) \
-	/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable." -subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(VIRTFILES1)  \
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) 
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) 
+
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
+	/NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 \
+	-machine:$(CPU) \
+	/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable." \
+	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
+	$(BUILDFILES) $(VIRTFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 clean:
@@ -72,4 +65,3 @@
 	-del ..\lib\$(LIBNAME).exp
 	-del ..\$(LIBNAME).pdb
 	-del $(DLLNAME)
-	
\ No newline at end of file

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -32,41 +32,33 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -Zi -WX  /I..\include /I..\text /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -Zi -WX /I..\include /I..\text /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32   $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = text_copyright.obj BidiWrapper.obj
+BUILDFILES = text_copyright.obj BidiWrapper.obj
 
-VIRTFILES1 = hytext.res
+VIRTFILES = hytext.res
 
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES1 = ..\lib\hysig.lib ..\lib\hycommon.lib ..\lib\hypool.lib
-MDLLIBFILES2 = ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib icuuc.lib
+MDLLIBFILES = \
+  ..\lib\hysig.lib ..\lib\hycommon.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
+  ..\lib\hythr.lib ..\lib\vmi.lib icuuc.lib
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+all: $(DLLNAME)
 	
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
 	/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable." \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) $(SYSLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib icuuc.lib $(LIBPATH)$(LIBNAME).exp
 
 clean:

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile?rev=381003&r1=381002&r2=381003&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 Sat Feb 25 14:01:20 2006
@@ -33,39 +33,35 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include  $(VMDEBUG) $*.cpp
-
 .asm.obj:
 	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
 
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = thread_copyright.obj thrhelp.obj thrspinlock.obj hythread.obj hythreadinspect.obj
-BUILDFILES2 = rwmutex.obj thrdsup.obj thrprof.obj
-
-VIRTFILES1 = hythr.res
+BUILDFILES = \
+  thread_copyright.obj thrhelp.obj thrspinlock.obj hythread.obj \
+  hythreadinspect.obj rwmutex.obj thrdsup.obj thrprof.obj
 
-MDLLIBFILES1 = ..\lib\hypool.lib ..\lib\hycommon.lib
+VIRTFILES = hythr.res
 
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
+MDLLIBFILES = ..\lib\hypool.lib ..\lib\hycommon.lib
 
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+all: $(DLLNAME)
 
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
 
 
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib $(LIBNAME).def \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) 
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x11500000 -machine:$(CPU) \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib $(LIBNAME).def
+	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
+	/NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x11500000 \
+	-machine:$(CPU) -subsystem:windows \
+	-out:$(DLLNAME) -map:$(LIBNAME).map  \
 	/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable." \
-	$(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1)  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 clean:

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile Sat Feb 25 14:01:20 2006
@@ -33,30 +33,19 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd  $(VMASMDEBUG) -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = vmi_copyright.obj vmi.obj
-
-VIRTFILES1 = vmi.res
-
-MDLLIBFILES1 = 
+BUILDFILES = vmi_copyright.obj vmi.obj
 
-all: \
-	 ..\lib\$(LIBNAME).lib
+VIRTFILES = vmi.res
 
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+all: ..\lib\$(LIBNAME).lib
 
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(VIRTFILES1) $(MDLLIBFILES1) 
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES)
 
 clean:
 	-del *.obj

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile Sat Feb 25 14:01:20 2006
@@ -26,21 +26,15 @@
 
 LIBPATH=..\lib\# declaration
 
-BUILDFILES1 = zcpool.obj zipalloc.obj zipcache.obj zipsup.obj
+BUILDFILES = zcpool.obj zipalloc.obj zipcache.obj zipsup.obj
 
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hyzip.pdb /I..\include /I..\zlib\dist  $(VMDEBUG) $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hyzip.pdb /I..\include /I..\zlib  $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME): $(BUILDFILES1)
-	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES1)
+$(LIBPATH)$(LIBNAME): $(BUILDFILES)
+	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-del *.obj

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile?rev=381003&r1=381002&r2=381003&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile Sat Feb 25 14:01:20 2006
@@ -33,37 +33,31 @@
 .c.obj:
 	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -W3 -Zi  /I..\include /I. $(VMDEBUG) -Fo$*.obj $*.c
 
-.cpp.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32 -Ogityb1 -Gs -GF -Zm400 -W3 -Zi  /I..\include /I. $(VMDEBUG) $*.cpp
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
-
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = zlib_copyright.obj dist/adler32.obj dist/compress.obj dist/crc32.obj dist/deflate.obj
-BUILDFILES2 = dist/gzio.obj dist/infback.obj dist/inffast.obj dist/inflate.obj dist/inftrees.obj dist/trees.obj
-BUILDFILES3 = dist/uncompr.obj dist/zutil.obj
-
-VIRTFILES1 = $(LIBNAME).res
-
-all: \
-	 ..\lib\$(LIBNAME).lib $(DLLNAME)
-
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib:\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(VIRTFILES1) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(VIRTFILES1) 
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(VIRTFILES1) 
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x11700000 -machine:$(CPU) \
+BUILDFILES = \
+  zlib_copyright.obj dist/adler32.obj dist/compress.obj dist/crc32.obj \
+  dist/deflate.obj dist/gzio.obj dist/infback.obj dist/inffast.obj \
+  dist/inflate.obj dist/inftrees.obj dist/trees.obj dist/uncompr.obj \
+  dist/zutil.obj
+
+VIRTFILES = $(LIBNAME).res
+
+all: $(DLLNAME)
+
+$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) 
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
+	-def:$(LIBNAME).def -machine:$(CPU) \
+	$(BUILDFILES) $(VIRTFILES) 
+
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
+	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
+	/NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x11700000 \
+	-machine:$(CPU) \
 	/comment:"zlib data compression library Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler" \
 	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(VIRTFILES1)  \
+	$(BUILDFILES) $(VIRTFILES)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
 clean:



Mime
View raw message