Return-Path: 
 <harmony-commits-return-957-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org
Received: (qmail 13666 invoked from network); 24 Feb 2006 11:11:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 Feb 2006 11:11:08 -0000
Received: (qmail 99136 invoked by uid 500); 24 Feb 2006 11:10:46 -0000
Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org
Received: (qmail 99053 invoked by uid 500); 24 Feb 2006 11:10:45 -0000
Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:harmony-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:harmony-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:harmony-commits@incubator.apache.org>
List-Id: <harmony-commits.incubator.apache.org>
Reply-To: harmony-dev@incubator.apache.org
Delivered-To: mailing list harmony-commits@incubator.apache.org
Received: (qmail 99000 invoked by uid 99); 24 Feb 2006 11:10:45 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2006 03:10:44 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 24 Feb 2006 03:10:43 -0800
Received: (qmail 13031 invoked by uid 65534); 24 Feb 2006 11:10:22 -0000
Message-ID: <20060224111022.13026.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r380640 - in
 /incubator/harmony/enhanced/classlib/trunk/native-src: ./
 linux.IA32/archive/ linux.IA32/fdlibm/ linux.IA32/zip/ linux.IA32/zlib/
 win.IA32/archive/ win.IA32/fdlibm/ win.IA32/zip/ win.IA32/zlib/
Date: Fri, 24 Feb 2006 11:10:18 -0000
To: harmony-commits@incubator.apache.org
From: tellison@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: tellison
Date: Fri Feb 24 03:10:13 2006
New Revision: 380640

URL: http://svn.apache.org/viewcvs?rev=380640&view=rev
Log:
Apply patch HARMONY-112 (native-src/build.xml should have clean-overlay-oss target)

Modified:
    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/fdlibm/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/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/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=380640&r1=380639&r2=380640&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Fri Feb 24 03:10:13 2006
@@ -28,13 +28,14 @@
          ================================= -->
     <target name="default" 
         description="Compile the native source into component shared libs." 
-        depends="overlay-oss, make-clean, make-all, clean-layout, layout" />
+        depends="clean-overlay-oss, overlay-oss, make-clean, make-all, clean-layout, layout" />
 
 
     <!-- ================================= 
           target: clean              
          ================================= -->
-    <target name="clean" depends="make-clean, clean-layout" />
+    <target name="clean"
+            depends="clean-overlay-oss, make-clean, clean-layout" />
 
 
     <!-- ================================= 
@@ -192,15 +193,27 @@
           target: overlay-oss              
          ================================= -->
     <target name="overlay-oss" depends="properties">
-        <unzip src="${fdlibm.zip}" dest="${native.src.root}/fdlibm" />
-        <chmod dir="${native.src.root}/fdlibm" perm="ugo+r" />
+        <unzip src="${fdlibm.zip}" dest="${native.src.root}/fdlibm/dist" />
+        <chmod dir="${native.src.root}/fdlibm/dist" perm="ugo+r" />
 
-        <unzip src="${zlib.zip}" dest="${native.src.root}/zlib" />
-        <chmod dir="${native.src.root}/zlib" perm="ugo+r" />
+        <unzip src="${zlib.zip}" dest="${native.src.root}/zlib/dist" />
+        <chmod dir="${native.src.root}/zlib/dist" perm="ugo+r" />
 
         <unzip src="${iculib.zip}" dest="${native.src.root}" />
         <chmod dir="${native.src.root}/include/unicode" perm="ugo+r" />
         <chmod dir="${native.src.root}/text" perm="ugo+r" />
+    </target>
+
+    <!-- ================================= 
+          target: clean-overlay-oss              
+         ================================= -->
+    <target name="clean-overlay-oss" depends="properties">
+        <delete dir="${native.src.root}/fdlibm/dist" quiet="true" />
+        <delete dir="${native.src.root}/zlib/dist" quiet="true" />
+        <delete dir="${native.src.root}/include/unicode" quiet="true" />
+        <!-- should really only delete one of these per platform ... -->
+        <delete file="${native.src.root}/text/icuuc.lib" quiet="true" />
+        <delete file="${native.src.root}/text/libicuuc.so.34" quiet="true" />
     </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile?rev=380640&r1=380639&r2=380640&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 Fri Feb 24 03:10:13 2006
@@ -26,7 +26,7 @@
 
 LIBPATH=../lib/# declaration
 
-CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include -I../archive -I../common -I../zlib -I../zip -I../fdlibm  $(VMDEBUG)
+CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include -I../archive -I../common -I../zlib/dist -I../zip -I../fdlibm  $(VMDEBUG)
 
 BUILDFILES = \
 	archive_copyright.o jclcrc32.o zip.o adler32.o inflater.o \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile?rev=380640&r1=380639&r2=380640&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile Fri Feb 24 03:10:13 2006
@@ -23,24 +23,29 @@
 LIBPATH=../lib/# declaration
 
 BUILDFILES = \
-	e_acos.o e_acosh.o e_asin.o e_atan2.o e_atanh.o \
-	e_cosh.o e_exp.o e_fmod.o e_gamma.o e_gamma_r.o \
-	e_hypot.o e_j0.o e_j1.o e_jn.o e_lgamma.o \
-	e_lgamma_r.o e_log.o e_log10.o e_pow.o e_rem_pio2.o \
-	e_remainder.o e_scalb.o e_sinh.o e_sqrt.o k_cos.o \
-	k_rem_pio2.o k_sin.o k_standard.o k_tan.o s_asinh.o \
-	s_atan.o s_cbrt.o s_ceil.o s_copysign.o s_cos.o \
-	s_erf.o s_expm1.o s_fabs.o s_finite.o s_floor.o \
-	s_frexp.o s_ilogb.o s_isnan.o s_ldexp.o s_lib_version.o \
-	s_log1p.o s_logb.o s_matherr.o s_modf.o s_nextafter.o \
-	s_rint.o s_scalbn.o s_signgam.o s_significand.o s_sin.o \
-	s_tan.o s_tanh.o w_acos.o w_acosh.o w_asin.o \
-	w_atan2.o w_atanh.o w_cosh.o w_exp.o w_fmod.o \
-	w_gamma.o w_gamma_r.o w_hypot.o w_j0.o w_j1.o \
-	w_jn.o w_lgamma.o w_lgamma_r.o w_log.o w_log10.o \
-	w_pow.o w_remainder.o w_scalb.o w_sinh.o w_sqrt.o
+	dist/e_acos.o dist/e_acosh.o dist/e_asin.o dist/e_atan2.o \
+	dist/e_atanh.o dist/e_cosh.o dist/e_exp.o dist/e_fmod.o \
+	dist/e_gamma.o dist/e_gamma_r.o dist/e_hypot.o dist/e_j0.o \
+	dist/e_j1.o dist/e_jn.o dist/e_lgamma.o dist/e_lgamma_r.o \
+	dist/e_log.o dist/e_log10.o dist/e_pow.o dist/e_rem_pio2.o \
+	dist/e_remainder.o dist/e_scalb.o dist/e_sinh.o dist/e_sqrt.o \
+	dist/k_cos.o dist/k_rem_pio2.o dist/k_sin.o dist/k_standard.o \
+	dist/k_tan.o dist/s_asinh.o dist/s_atan.o dist/s_cbrt.o dist/s_ceil.o \
+	dist/s_copysign.o dist/s_cos.o dist/s_erf.o dist/s_expm1.o \
+	dist/s_fabs.o dist/s_finite.o dist/s_floor.o dist/s_frexp.o \
+	dist/s_ilogb.o dist/s_isnan.o dist/s_ldexp.o s_lib_version.o \
+	dist/s_log1p.o dist/s_logb.o dist/s_matherr.o dist/s_modf.o \
+	dist/s_nextafter.o dist/s_rint.o dist/s_scalbn.o dist/s_signgam.o \
+	dist/s_significand.o dist/s_sin.o dist/s_tan.o dist/s_tanh.o \
+	dist/w_acos.o dist/w_acosh.o dist/w_asin.o dist/w_atan2.o \
+	dist/w_atanh.o dist/w_cosh.o dist/w_exp.o dist/w_fmod.o \
+	dist/w_gamma.o dist/w_gamma_r.o dist/w_hypot.o dist/w_j0.o \
+	dist/w_j1.o dist/w_jn.o dist/w_lgamma.o dist/w_lgamma_r.o \
+	dist/w_log.o dist/w_log10.o dist/w_pow.o dist/w_remainder.o \
+	dist/w_scalb.o dist/w_sinh.o dist/w_sqrt.o
 
-CFLAGS=-O0 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM -DHY_PLATFORM_DOUBLE_ORDER -I../include -ffloat-store $(VMDEBUG)
+CFLAGS= -O0 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
+        -DHY_PLATFORM_DOUBLE_ORDER -I../include -I. -ffloat-store $(VMDEBUG)
 
 all: $(LIBPATH)$(LIBNAME)
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile?rev=380640&r1=380639&r2=380640&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile Fri Feb 24 03:10:13 2006
@@ -24,7 +24,7 @@
 
 BUILDFILES = zcpool.o zipalloc.o zipcache.o zipsup.o
 
-CFLAGS= -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include -I../zlib  $(VMDEBUG)
+CFLAGS= -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include -I../zlib/dist  $(VMDEBUG)
 
 all: $(LIBPATH)$(LIBNAME)
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile?rev=380640&r1=380639&r2=380640&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile Fri Feb 24 03:10:13 2006
@@ -26,12 +26,13 @@
 
 LIBPATH=../lib/# declaration
 
-CFLAGS=-fpic -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86  -I../include -I.  $(VMDEBUG)
+CFLAGS=-fpic -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86  -I../include -I. $(VMDEBUG)
 
 
 BUILDFILES = \
-	zlib_copyright.o adler32.o compress.o crc32.o deflate.o infback.o \
-	inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+	zlib_copyright.o dist/adler32.o dist/compress.o dist/crc32.o \
+	dist/deflate.o dist/infback.o dist/inffast.o dist/inflate.o \
+	dist/inftrees.o dist/trees.o dist/uncompr.o dist/zutil.o
 
 all: $(DLLNAME)
 

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=380640&r1=380639&r2=380640&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 Fri Feb 24 03:10:13 2006
@@ -31,10 +31,10 @@
 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..\archive /I..\common /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG) $*.c
+	$(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 /I..\zip /I..\fdlibm  $(VMDEBUG) $*.cpp
+	$(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  $<
@@ -71,7 +71,7 @@
 	$(SYSLIBFILES1)  \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
 
-	
+
 clean:
 	-del *.map
 	-del *.obj

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=380640&r1=380639&r2=380640&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 Fri Feb 24 03:10:13 2006
@@ -25,25 +25,25 @@
 
 LIBPATH=..\lib\# declaration
 
-BUILDFILES1 = e_acos.obj e_acosh.obj e_asin.obj e_atan2.obj e_atanh.obj
-BUILDFILES2 = e_cosh.obj e_exp.obj e_fmod.obj e_gamma.obj e_gamma_r.obj
-BUILDFILES3 = e_hypot.obj e_j0.obj e_j1.obj e_jn.obj e_lgamma.obj
-BUILDFILES4 = e_lgamma_r.obj e_log.obj e_log10.obj e_pow.obj e_rem_pio2.obj
-BUILDFILES5 = e_remainder.obj e_scalb.obj e_sinh.obj e_sqrt.obj k_cos.obj
-BUILDFILES6 = k_rem_pio2.obj k_sin.obj k_standard.obj k_tan.obj s_asinh.obj
-BUILDFILES7 = s_atan.obj s_cbrt.obj s_ceil.obj s_copysign.obj s_cos.obj
-BUILDFILES8 = s_erf.obj s_expm1.obj s_fabs.obj s_finite.obj s_floor.obj
-BUILDFILES9 = s_frexp.obj s_ilogb.obj s_isnan.obj s_ldexp.obj s_lib_version.obj
-BUILDFILES10 = s_log1p.obj s_logb.obj s_matherr.obj s_modf.obj s_nextafter.obj
-BUILDFILES11 = s_rint.obj s_scalbn.obj s_signgam.obj s_significand.obj s_sin.obj
-BUILDFILES12 = s_tan.obj s_tanh.obj w_acos.obj w_acosh.obj w_asin.obj
-BUILDFILES13 = w_atan2.obj w_atanh.obj w_cosh.obj w_exp.obj w_fmod.obj
-BUILDFILES14 = w_gamma.obj w_gamma_r.obj w_hypot.obj w_j0.obj w_j1.obj
-BUILDFILES15 = w_jn.obj w_lgamma.obj w_lgamma_r.obj w_log.obj w_log10.obj
-BUILDFILES16 = w_pow.obj w_remainder.obj w_scalb.obj w_sinh.obj w_sqrt.obj
+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
 
 .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 $(VMDEBUG) $*.c
+	$(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

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=380640&r1=380639&r2=380640&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 Fri Feb 24 03:10:13 2006
@@ -29,7 +29,7 @@
 BUILDFILES1 = 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  $(VMDEBUG) $*.c
+	$(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

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=380640&r1=380639&r2=380640&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 Fri Feb 24 03:10:13 2006
@@ -31,7 +31,7 @@
 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 -W3 -Zi  /I..\include /I. $(VMDEBUG) $*.c
+	$(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
@@ -42,9 +42,9 @@
 .rc.res:
 	rc -I..\include $<
 
-BUILDFILES1 = zlib_copyright.obj adler32.obj compress.obj crc32.obj deflate.obj
-BUILDFILES2 = gzio.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj
-BUILDFILES3 = uncompr.obj zutil.obj
+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