harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1002388 - in /harmony/enhanced/java/branches/mrh: classlib/modules/archive/src/main/native/archive/windows/ classlib/modules/archive/src/main/native/zip/windows/ classlib/modules/archive/src/main/native/zlib/windows/ classlib/modules/auth/...
Date Tue, 28 Sep 2010 22:30:23 GMT
Author: hindessm
Date: Tue Sep 28 22:30:21 2010
New Revision: 1002388

URL: http://svn.apache.org/viewvc?rev=1002388&view=rev
Log:
First pass at getting windows working on my branch.

Modified:
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/native/print/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'archive'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\archive\native\archive\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyarchive
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -27,10 +28,9 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-	$(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
+	$(HY_BIN)archive_copyright.obj $(HY_BIN)jclcrc32.obj \
+	$(HY_BIN)zip.obj $(HY_BIN)adler32.obj $(HY_BIN)inflater.obj \
+	$(HY_BIN)jarfile.obj $(HY_BIN)deflater.obj $(HY_BIN)archiveglob.obj
 
 VIRTFILES = $(LIBBASE).res
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,13 +17,15 @@
 # Makefile for module 'zip'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\archive\native\zip\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyzip
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
-	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj \
+BUILDFILES = $(HY_BIN)zcpool.obj $(HY_BIN)zipalloc.obj \
+	$(HY_BIN)zipcache.obj $(HY_BIN)zipsup.obj \
         $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
-HYCFLAGS = $(HYCFLAGS) /I..\..\zlib_dist
+ZLIB_DIST = $(HY_TARGET)\depends\native\zlib_dist\# trailing slash
+HYCFLAGS = $(HYCFLAGS) /I$(ZLIB_DIST)
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,21 +17,22 @@
 # Makefile for module 'zlib'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\archive\native\zlib\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyzlib
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-ZLIB_DIST=..\..\zlib_dist\# Path to zlib
+OSS_DIST = $(HY_TARGET)\depends\native\zlib_dist\# trailing slash
 
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)zlib_copyright.obj $(ZLIB_DIST)adler32.obj $(ZLIB_DIST)compress.obj \
-  $(ZLIB_DIST)crc32.obj $(ZLIB_DIST)deflate.obj $(ZLIB_DIST)infback.obj \
-  $(ZLIB_DIST)inffast.obj $(ZLIB_DIST)inflate.obj $(ZLIB_DIST)inftrees.obj $(ZLIB_DIST)trees.obj \
-  $(ZLIB_DIST)uncompr.obj $(ZLIB_DIST)zutil.obj
+  $(HY_BIN)zlib_copyright.obj $(HY_BIN)adler32.obj $(HY_BIN)compress.obj \
+  $(HY_BIN)crc32.obj $(HY_BIN)deflate.obj $(HY_BIN)infback.obj \
+  $(HY_BIN)inffast.obj $(HY_BIN)inflate.obj $(HY_BIN)inftrees.obj \
+  $(HY_BIN)trees.obj $(HY_BIN)uncompr.obj $(HY_BIN)zutil.obj
 
 VIRTFILES = $(LIBBASE).res
 DLLBASE=0x11700000

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,12 +17,13 @@
 # Makefile for module 'auth'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\auth\native\auth\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyauth
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-BUILDFILES = $(SHAREDSUB)auth_copyright.obj authwin32.obj
+BUILDFILES = $(HY_BIN)auth_copyright.obj $(HY_BIN)authwin32.obj
 VIRTFILES = $(LIBBASE).res
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\fontlib\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=FL
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -24,19 +25,19 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)inc
 	/EHsc
 
 BUILDFILES = \
-  $(SHAREDSUB)fljni.obj \
-  $(SHAREDSUB)EncodedValue.obj \
-  $(SHAREDSUB)Environment.obj \
-  $(SHAREDSUB)Font.obj \
-  $(SHAREDSUB)Glyph.obj \
-  $(SHAREDSUB)Outline.obj \
-  $(SHAREDSUB)ParsingTables.obj \
-  $(SHAREDSUB)T1Font.obj \
-  $(SHAREDSUB)T1Glyph.obj \
-  $(SHAREDSUB)TTCurve.obj \
-  $(SHAREDSUB)TTFont.obj \
-  $(SHAREDSUB)TypeDefinition.obj \
-  FontLibExports.obj
+  $(HY_BIN)fljni.obj \
+  $(HY_BIN)EncodedValue.obj \
+  $(HY_BIN)Environment.obj \
+  $(HY_BIN)Font.obj \
+  $(HY_BIN)Glyph.obj \
+  $(HY_BIN)Outline.obj \
+  $(HY_BIN)ParsingTables.obj \
+  $(HY_BIN)T1Font.obj \
+  $(HY_BIN)T1Glyph.obj \
+  $(HY_BIN)TTCurve.obj \
+  $(HY_BIN)TTFont.obj \
+  $(HY_BIN)TypeDefinition.obj \
+  $(HY_BIN)FontLibExports.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile Tue Sep 28 22:30:21 2010
@@ -14,7 +14,8 @@
 # limitations under the License.
 
 APPVER = 5.0 # Need WINVER=0x0500 to get HMONITOR defined.
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\gl\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 PNG_DIR=$(HY_PNG_DIR)\# avoid continuation
 
@@ -27,18 +28,18 @@ HYCFLAGS = $(HYCFLAGS) /D_WIN32_WINNT=0x
            /I$(PNG_DIR) /Iinclude
 
 BUILDFILES = \
-  BitmapSurface.obj \
-  GDIBlitter.obj \
-  WinGDIGraphics2D.obj \
-  WinGDIPGraphics2D.obj \
-  WinGraphicsEnvironment.obj \
-  WinThemeGraphics.obj \
-  LockingKeys.obj \
-  $(SHAREDSUB)blitter.obj \
-  $(SHAREDSUB)gifdecoder.obj \
-  $(SHAREDSUB)LUTTables.obj \
-  $(SHAREDSUB)pngdecoder.obj \
-  $(SHAREDSUB)SurfaceDataStructure.obj \
+  $(HY_BIN)BitmapSurface.obj \
+  $(HY_BIN)GDIBlitter.obj \
+  $(HY_BIN)WinGDIGraphics2D.obj \
+  $(HY_BIN)WinGDIPGraphics2D.obj \
+  $(HY_BIN)WinGraphicsEnvironment.obj \
+  $(HY_BIN)WinThemeGraphics.obj \
+  $(HY_BIN)LockingKeys.obj \
+  $(HY_BIN)blitter.obj \
+  $(HY_BIN)gifdecoder.obj \
+  $(HY_BIN)LUTTables.obj \
+  $(HY_BIN)pngdecoder.obj \
+  $(HY_BIN)SurfaceDataStructure.obj \
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib \

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\jpegdecoder\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 JPEG_DIR=$(HY_JPEG_DIR)\# avoid continuation
 
@@ -24,7 +25,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
 
-BUILDFILES = $(SHAREDSUB)JpegDecoder.obj
+BUILDFILES = $(HY_BIN)JpegDecoder.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
@@ -37,7 +38,7 @@ CLEANFILES=jconfig.h
 
 !include <$(HY_HDK)\build\make\rules.mak>
 
-$(SHAREDSUB)JpegDecoder.obj: jconfig.h
+$(HY_BIN)JpegDecoder.obj: jconfig.h
 
 jconfig.h: $(JPEG_DIR)jconfig.vc
 	copy $(JPEG_DIR)jconfig.vc $@

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\lcmm\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LCMS_DIR=$(HY_LCMS_DIR)\# avoid continuation
 
@@ -25,11 +26,11 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR)include /I$(SHAREDSUB)include
 
 BUILDFILES = \
-  $(SHAREDSUB)cmmerror.obj \
-  $(SHAREDSUB)cmmio.obj \
-  $(SHAREDSUB)cmmxforms.obj \
-  $(SHAREDSUB)NativeCMM.obj \
-  $(SHAREDSUB)NativeImageFormat.obj
+  $(HY_BIN)cmmerror.obj \
+  $(HY_BIN)cmmio.obj \
+  $(HY_BIN)cmmxforms.obj \
+  $(HY_BIN)NativeCMM.obj \
+  $(HY_BIN)NativeImageFormat.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\oglwrapper\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=oglwrapper
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -22,7 +23,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHAREDSUB)include
 
-BUILDFILES = $(SHAREDSUB)org_apache_harmony_awt_gl_opengl_GL.obj
+BUILDFILES = $(HY_BIN)org_apache_harmony_awt_gl_opengl_GL.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\win32wrapper\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=Win32Wrapper
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -21,12 +22,12 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  Callback.obj \
-  org_apache_harmony_awt_nativebridge_windows_Win32.obj \
-  org_apache_harmony_awt_nativebridge_windows_WGL.obj \
-  WinDataTransfer.obj \
-  WinManagement.obj \
-  nativelib_common.obj
+  $(HY_BIN)Callback.obj \
+  $(HY_BIN)org_apache_harmony_awt_nativebridge_windows_Win32.obj \
+  $(HY_BIN)org_apache_harmony_awt_nativebridge_windows_WGL.obj \
+  $(HY_BIN)WinDataTransfer.obj \
+  $(HY_BIN)WinManagement.obj \
+  $(HY_BIN)nativelib_common.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile Tue Sep 28 22:30:21 2010
@@ -15,7 +15,8 @@
 
 TARGETOS = WINNT # Need _WIN32_WINNT=0x0500 to get GLYPHSET defined.
 APPVER = 5.0 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\winfont\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=fontlib
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -25,7 +26,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 HYCFLAGS = $(HYCFLAGS) /Iinclude /I..\..\gl\windows\include /I..\..\fontlib\shared /I..\..\fontlib\windows \
   -DUNICODE -D_UNICODE
 
-BUILDFILES = winFont.obj
+BUILDFILES = $(HY_BIN)winFont.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\imageio\native\jpegencoder\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 JPEG_DIR=$(HY_JPEG_DIR)\# avoid continuation
 
@@ -35,7 +36,7 @@ HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
 !ENDIF
 
 
-BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
+BUILDFILES = $(HY_BIN)JpegEncoder.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
@@ -48,7 +49,7 @@ CLEANFILES=jconfig.h
 
 !include <$(HY_HDK)\build\make\rules.mak>
 
-$(SHAREDSUB)JpegEncoder.obj: jconfig.h
+$(HY_BIN)JpegEncoder.obj: jconfig.h
 
 jconfig.h: $(JPEG_DIR)jconfig.vc
 	copy $(JPEG_DIR)jconfig.vc $@

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\imageio\native\pngencoder\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 PNG_DIR=$(HY_PNG_DIR)\# avoid continuation
 
@@ -25,7 +26,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)include /I$(SHAREDSUB) \
            /I$(PNG_DIR) /Iinclude
 
-BUILDFILES = $(SHAREDSUB)pngencoder.obj
+BUILDFILES = $(HY_BIN)pngencoder.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'instrument'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\instrument\native\instrument\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyinstrument
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -26,7 +27,7 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)instrument.obj $(SHAREDSUB)inst_agt.obj 
+  $(HY_BIN)instrument.obj $(HY_BIN)inst_agt.obj 
 
 VIRTFILES = hyinstrument.res
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,50 +17,62 @@
 # Makefile for module 'fdlibm'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\fdlibm\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBNAME=$(LIBPATH)hyfdlibm.lib
 
-FDLIBM_DIST=..\..\fdlibm_dist\# Comment to stop line continuation
+OSS_DIST=$(HY_TARGET)\depends\native\fdlibm_dist\# Path to fdlibm
 
 BUILDFILES = \
-  $(FDLIBM_DIST)e_acos.obj $(FDLIBM_DIST)e_acosh.obj $(FDLIBM_DIST)e_asin.obj $(FDLIBM_DIST)e_atan2.obj \
-  $(FDLIBM_DIST)e_atanh.obj $(FDLIBM_DIST)e_cosh.obj $(FDLIBM_DIST)e_exp.obj $(FDLIBM_DIST)e_fmod.obj \
-  $(FDLIBM_DIST)e_gamma.obj $(FDLIBM_DIST)e_gamma_r.obj $(FDLIBM_DIST)e_hypot.obj $(FDLIBM_DIST)e_j0.obj \
-  $(FDLIBM_DIST)e_j1.obj $(FDLIBM_DIST)e_jn.obj $(FDLIBM_DIST)e_lgamma.obj $(FDLIBM_DIST)e_lgamma_r.obj \
-  $(FDLIBM_DIST)e_log.obj $(FDLIBM_DIST)e_log10.obj $(FDLIBM_DIST)e_pow.obj $(FDLIBM_DIST)e_rem_pio2.obj \
-  $(FDLIBM_DIST)e_remainder.obj $(FDLIBM_DIST)e_scalb.obj $(FDLIBM_DIST)e_sinh.obj $(FDLIBM_DIST)e_sqrt.obj \
-  $(FDLIBM_DIST)k_cos.obj $(FDLIBM_DIST)k_rem_pio2.obj $(FDLIBM_DIST)k_sin.obj $(FDLIBM_DIST)k_standard.obj \
-  $(FDLIBM_DIST)k_tan.obj $(FDLIBM_DIST)s_asinh.obj $(FDLIBM_DIST)s_atan.obj $(FDLIBM_DIST)s_cbrt.obj \
-  $(FDLIBM_DIST)s_ceil.obj $(FDLIBM_DIST)s_copysign.obj $(FDLIBM_DIST)s_cos.obj $(FDLIBM_DIST)s_erf.obj \
-  $(FDLIBM_DIST)s_expm1.obj $(FDLIBM_DIST)s_fabs.obj $(FDLIBM_DIST)s_finite.obj $(FDLIBM_DIST)s_floor.obj \
-  $(FDLIBM_DIST)s_frexp.obj $(FDLIBM_DIST)s_ilogb.obj $(FDLIBM_DIST)s_isnan.obj $(FDLIBM_DIST)s_ldexp.obj \
-  $(SHAREDSUB)s_lib_version.obj \
-  $(FDLIBM_DIST)s_log1p.obj $(FDLIBM_DIST)s_logb.obj $(FDLIBM_DIST)s_matherr.obj \
-  $(FDLIBM_DIST)s_modf.obj $(FDLIBM_DIST)s_nextafter.obj $(FDLIBM_DIST)s_rint.obj $(FDLIBM_DIST)s_scalbn.obj \
-  $(FDLIBM_DIST)s_signgam.obj $(FDLIBM_DIST)s_significand.obj $(FDLIBM_DIST)s_sin.obj $(FDLIBM_DIST)s_tan.obj \
-  $(FDLIBM_DIST)s_tanh.obj $(FDLIBM_DIST)w_acos.obj $(FDLIBM_DIST)w_acosh.obj $(FDLIBM_DIST)w_asin.obj \
-  $(FDLIBM_DIST)w_atan2.obj $(FDLIBM_DIST)w_atanh.obj $(FDLIBM_DIST)w_cosh.obj $(FDLIBM_DIST)w_exp.obj \
-  $(FDLIBM_DIST)w_fmod.obj $(FDLIBM_DIST)w_gamma.obj $(FDLIBM_DIST)w_gamma_r.obj $(FDLIBM_DIST)w_hypot.obj \
-  $(FDLIBM_DIST)w_j0.obj $(FDLIBM_DIST)w_j1.obj $(FDLIBM_DIST)w_jn.obj $(FDLIBM_DIST)w_lgamma.obj \
-  $(FDLIBM_DIST)w_lgamma_r.obj $(FDLIBM_DIST)w_log.obj $(FDLIBM_DIST)w_log10.obj $(FDLIBM_DIST)w_pow.obj \
-  $(FDLIBM_DIST)w_remainder.obj $(FDLIBM_DIST)w_scalb.obj $(FDLIBM_DIST)w_sinh.obj $(FDLIBM_DIST)w_sqrt.obj
+  $(HY_BIN)e_acos.obj $(HY_BIN)e_acosh.obj $(HY_BIN)e_asin.obj \
+  $(HY_BIN)e_atan2.obj $(HY_BIN)e_atanh.obj $(HY_BIN)e_cosh.obj \
+  $(HY_BIN)e_exp.obj $(HY_BIN)e_fmod.obj $(HY_BIN)e_gamma.obj \
+  $(HY_BIN)e_gamma_r.obj $(HY_BIN)e_hypot.obj $(HY_BIN)e_j0.obj \
+  $(HY_BIN)e_j1.obj $(HY_BIN)e_jn.obj $(HY_BIN)e_lgamma.obj \
+  $(HY_BIN)e_lgamma_r.obj $(HY_BIN)e_log.obj $(HY_BIN)e_log10.obj \
+  $(HY_BIN)e_pow.obj $(HY_BIN)e_rem_pio2.obj $(HY_BIN)e_remainder.obj \
+  $(HY_BIN)e_scalb.obj $(HY_BIN)e_sinh.obj $(HY_BIN)e_sqrt.obj \
+  $(HY_BIN)k_cos.obj $(HY_BIN)k_rem_pio2.obj $(HY_BIN)k_sin.obj \
+  $(HY_BIN)k_standard.obj $(HY_BIN)k_tan.obj $(HY_BIN)s_asinh.obj \
+  $(HY_BIN)s_atan.obj $(HY_BIN)s_cbrt.obj $(HY_BIN)s_ceil.obj \
+  $(HY_BIN)s_copysign.obj $(HY_BIN)s_cos.obj $(HY_BIN)s_erf.obj \
+  $(HY_BIN)s_expm1.obj $(HY_BIN)s_fabs.obj $(HY_BIN)s_finite.obj \
+  $(HY_BIN)s_floor.obj $(HY_BIN)s_frexp.obj $(HY_BIN)s_ilogb.obj \
+  $(HY_BIN)s_isnan.obj $(HY_BIN)s_ldexp.obj $(HY_BIN)s_lib_version.obj \
+  $(HY_BIN)s_log1p.obj $(HY_BIN)s_logb.obj $(HY_BIN)s_matherr.obj \
+  $(HY_BIN)s_modf.obj $(HY_BIN)s_nextafter.obj $(HY_BIN)s_rint.obj \
+  $(HY_BIN)s_scalbn.obj $(HY_BIN)s_signgam.obj $(HY_BIN)s_significand.obj \
+  $(HY_BIN)s_sin.obj $(HY_BIN)s_tan.obj $(HY_BIN)s_tanh.obj \
+  $(HY_BIN)w_acos.obj $(HY_BIN)w_acosh.obj $(HY_BIN)w_asin.obj \
+  $(HY_BIN)w_atan2.obj $(HY_BIN)w_atanh.obj $(HY_BIN)w_cosh.obj \
+  $(HY_BIN)w_exp.obj $(HY_BIN)w_fmod.obj $(HY_BIN)w_gamma.obj \
+  $(HY_BIN)w_gamma_r.obj $(HY_BIN)w_hypot.obj $(HY_BIN)w_j0.obj \
+  $(HY_BIN)w_j1.obj $(HY_BIN)w_jn.obj $(HY_BIN)w_lgamma.obj \
+  $(HY_BIN)w_lgamma_r.obj $(HY_BIN)w_log.obj $(HY_BIN)w_log10.obj \
+  $(HY_BIN)w_pow.obj $(HY_BIN)w_remainder.obj $(HY_BIN)w_scalb.obj \
+  $(HY_BIN)w_sinh.obj $(HY_BIN)w_sqrt.obj
 
 HYCFLAGS = -Oityb1 -W3 -Fd$(LIBPATH)hyfdlibm.pdb -D_IEEE_LIBM \
-	   /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include
+	   /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include \
+	   /I$(OSS_DIST)
 
-.c.obj:
-        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+all: $(HY_BIN) $(LIBNAME)
 
-$(LIBPATH)$(LIBNAME): $(BUILDFILES)
-	@echo /NOLOGO -out:$(LIBNAME) >templrf
-	@echo $(BUILDFILES) >>templrf
-	$(implib) @templrf
-	@del templrf
+$(HY_BIN):
+	-mkdir $(HY_BIN)
+
+{$(OSS_DIST)}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+$(LIBNAME): $(BUILDFILES)
+	$(implib) /NOLOGO -out:$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-del *.obj dist\*.obj
 	-del $(LIBNAME)
 	-del $(LIBPATH)hyfdlibm.pdb
         -del $(SHAREDSUB)*.obj
-

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae Tue Sep 28 22:30:21 2010
@@ -17,18 +17,19 @@
 # Makefile for module 'launcher.java'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\launcher\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 EXEBASE=java
 EXENAME=$(EXEPATH)$(EXEBASE).exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
-BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
-        $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+BUILDFILES = $(HY_BIN)launcher_copyright.obj $(HY_BIN)cmain.obj \
+        $(HY_BIN)main.obj $(HY_BIN)strbuf.obj $(HY_BIN)libhlp.obj
 !IF "$(HY_NO_THR)" == "false"
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 !ELSE
-BUILDFILES = $(BUILDFILES) main_hlp.obj
+BUILDFILES = $(BUILDFILES) $(HY_BIN)main_hlp.obj
 !ENDIF
 
 VIRTFILES = java.res

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw Tue Sep 28 22:30:21 2010
@@ -17,18 +17,19 @@
 # Makefile for module 'launcher.javaw'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\launcher\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 EXEBASE=javaw
 EXENAME=$(EXEPATH)$(EXEBASE).exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
-BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
-        winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+BUILDFILES = $(HY_BIN)launcher_copyright.obj $(HY_BIN)main.obj \
+             $(HY_BIN)winmain.obj $(HY_BIN)strbuf.obj $(HY_BIN)libhlp.obj
 !IF "$(HY_NO_THR)" == "false"
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 !ELSE
-BUILDFILES = $(BUILDFILES) main_hlp.obj
+BUILDFILES = $(BUILDFILES) $(HY_BIN)main_hlp.obj
 !ENDIF
 VIRTFILES = javaw.res
 EXEFLAGS=$(guilflags) -subsystem:windows

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'luni'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\luni\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyluni
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -26,17 +27,17 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)luni_copyright.obj $(SHAREDSUB)file.obj procimpl.obj \
-  $(SHAREDSUB)nethelp.obj $(SHAREDSUB)floatbits.obj \
-  helpers.obj $(SHAREDSUB)math.obj \
-  $(SHAREDSUB)luniglob.obj $(SHAREDSUB)proxy.obj $(SHAREDSUB)netif.obj \
-  $(SHAREDSUB)cbigint.obj $(SHAREDSUB)dblparse.obj $(SHAREDSUB)fltparse.obj \
-  $(SHAREDSUB)process.obj $(SHAREDSUB)bigint.obj $(SHAREDSUB)osc.obj \
-  $(SHAREDSUB)socket.obj $(SHAREDSUB)inetadds.obj \
-  $(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj \
-  OSFileSystemWin32.obj hyenv.obj\
-  $(SHAREDSUB)OSFileSystem.obj OSMemoryWin32.obj $(SHAREDSUB)OSMemory.obj \
-  $(SHAREDSUB)OSNetworkSystem.obj OSNetworkSystemWin32.obj
+  $(HY_BIN)luni_copyright.obj $(HY_BIN)file.obj $(HY_BIN)procimpl.obj \
+  $(HY_BIN)nethelp.obj $(HY_BIN)floatbits.obj \
+  $(HY_BIN)helpers.obj $(HY_BIN)math.obj \
+  $(HY_BIN)luniglob.obj $(HY_BIN)proxy.obj $(HY_BIN)netif.obj \
+  $(HY_BIN)cbigint.obj $(HY_BIN)dblparse.obj $(HY_BIN)fltparse.obj \
+  $(HY_BIN)process.obj $(HY_BIN)bigint.obj $(HY_BIN)osc.obj \
+  $(HY_BIN)socket.obj $(HY_BIN)inetadds.obj \
+  $(HY_BIN)filedesc.obj $(HY_BIN)timezone.obj \
+  $(HY_BIN)OSFileSystemWin32.obj $(HY_BIN)hyenv.obj\
+  $(HY_BIN)OSFileSystem.obj $(HY_BIN)OSMemoryWin32.obj $(HY_BIN)OSMemory.obj \
+  $(HY_BIN)OSNetworkSystem.obj $(HY_BIN)OSNetworkSystemWin32.obj
 
 VIRTFILES = hyluni.res
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,14 +17,15 @@
 # Makefile for module 'vmi'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\vmi\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=vmi
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = $(SHAREDSUB)vmi_copyright.obj $(SHAREDSUB)vmi.obj
+BUILDFILES = $(HY_BIN)vmi_copyright.obj $(HY_BIN)vmi.obj
 
 VIRTFILES = vmi.res
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,12 +17,12 @@
 # Makefile for module 'vmls'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\vmls\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBNAME=$(LIBPATH)hyvmls.lib
 
-BUILDFILES = \
-	$(SHAREDSUB)vmls.obj
+BUILDFILES = $(HY_BIN)vmls.obj
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\include\shared /I..\..\include\windows
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\misc\native\accessors\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=accessors
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -21,11 +22,11 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_ArrayAccessorImpl.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_Malloc.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_MemoryAccessorNativeImpl.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_ObjectAccessorImpl.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.obj
+  $(HY_BIN)org_apache_harmony_misc_accessors_ArrayAccessorImpl.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_Malloc.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_MemoryAccessorNativeImpl.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_ObjectAccessorImpl.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_StringAccessorImpl.obj
 VIRTFILES = accessors.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'nio'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\nio\native\nio\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hynio
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -25,8 +26,7 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = \
-  $(SHAREDSUB)DirectBufferUtil.obj $(SHAREDSUB)AddressUtil.obj
+BUILDFILES = $(HY_BIN)DirectBufferUtil.obj $(HY_BIN)AddressUtil.obj
 VIRTFILES = hynio.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'nio_char'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\nio_char\native\niochar\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyniochar
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -27,100 +28,100 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 ADDITIONAL = $(SHAREDSUB)\additional\#
 
 BUILDFILES = \
-  $(SHAREDSUB)CP_1250.obj \
-  $(SHAREDSUB)CP_1251.obj \
-  $(SHAREDSUB)CP_1252.obj \
-  $(SHAREDSUB)CP_1253.obj \
-  $(SHAREDSUB)CP_1254.obj \
-  $(SHAREDSUB)CP_1257.obj \
-  $(SHAREDSUB)ISO_8859_1.obj \
-  $(SHAREDSUB)ISO_8859_2.obj \
-  $(SHAREDSUB)ISO_8859_4.obj \
-  $(SHAREDSUB)ISO_8859_5.obj \
-  $(SHAREDSUB)ISO_8859_7.obj \
-  $(SHAREDSUB)ISO_8859_9.obj \
-  $(SHAREDSUB)ISO_8859_13.obj \
-  $(SHAREDSUB)ISO_8859_15.obj \
-  $(SHAREDSUB)KOI8_R.obj \
-  $(SHAREDSUB)US_ASCII.obj \
-  $(SHAREDSUB)IBM866.obj \
-  $(ADDITIONAL)IBM00858.obj \
-  $(ADDITIONAL)IBM01140.obj \
-  $(ADDITIONAL)IBM01141.obj \
-  $(ADDITIONAL)IBM01142.obj \
-  $(ADDITIONAL)IBM01143.obj \
-  $(ADDITIONAL)IBM01144.obj \
-  $(ADDITIONAL)IBM01145.obj \
-  $(ADDITIONAL)IBM01146.obj \
-  $(ADDITIONAL)IBM01147.obj \
-  $(ADDITIONAL)IBM01148.obj \
-  $(ADDITIONAL)IBM01149.obj \
-  $(ADDITIONAL)IBM037.obj \
-  $(ADDITIONAL)IBM1026.obj \
-  $(ADDITIONAL)IBM1047.obj \
-  $(ADDITIONAL)IBM273.obj \
-  $(ADDITIONAL)IBM277.obj \
-  $(ADDITIONAL)IBM278.obj \
-  $(ADDITIONAL)IBM280.obj \
-  $(ADDITIONAL)IBM284.obj \
-  $(ADDITIONAL)IBM285.obj \
-  $(ADDITIONAL)IBM297.obj \
-  $(ADDITIONAL)IBM420.obj \
-  $(ADDITIONAL)IBM424.obj \
-  $(ADDITIONAL)IBM437.obj \
-  $(ADDITIONAL)IBM500.obj \
-  $(ADDITIONAL)IBM775.obj \
-  $(ADDITIONAL)IBM850.obj \
-  $(ADDITIONAL)IBM852.obj \
-  $(ADDITIONAL)IBM855.obj \
-  $(ADDITIONAL)IBM857.obj \
-  $(ADDITIONAL)IBM860.obj \
-  $(ADDITIONAL)IBM861.obj \
-  $(ADDITIONAL)IBM862.obj \
-  $(ADDITIONAL)IBM863.obj \
-  $(ADDITIONAL)IBM864.obj \
-  $(ADDITIONAL)IBM865.obj \
-  $(ADDITIONAL)IBM868.obj \
-  $(ADDITIONAL)IBM869.obj \
-  $(ADDITIONAL)IBM870.obj \
-  $(ADDITIONAL)IBM871.obj \
-  $(ADDITIONAL)IBM918.obj \
-  $(ADDITIONAL)IBM_Thai.obj \
-  $(ADDITIONAL)ISO_8859_3.obj \
-  $(ADDITIONAL)ISO_8859_6.obj \
-  $(ADDITIONAL)ISO_8859_8.obj \
-  $(ADDITIONAL)windows_1255.obj \
-  $(ADDITIONAL)windows_1256.obj \
-  $(ADDITIONAL)x_IBM1006.obj \
-  $(ADDITIONAL)x_IBM1025.obj \
-  $(ADDITIONAL)x_IBM1097.obj \
-  $(ADDITIONAL)x_IBM1098.obj \
-  $(ADDITIONAL)x_IBM1112.obj \
-  $(ADDITIONAL)x_IBM1122.obj \
-  $(ADDITIONAL)x_IBM1123.obj \
-  $(ADDITIONAL)x_IBM1124.obj \
-  $(ADDITIONAL)x_IBM737.obj \
-  $(ADDITIONAL)x_IBM856.obj \
-  $(ADDITIONAL)x_IBM874.obj \
-  $(ADDITIONAL)x_IBM875.obj \
-  $(ADDITIONAL)x_IBM922.obj \
-  $(ADDITIONAL)x_MacCyrillic.obj \
-  $(ADDITIONAL)x_MacGreek.obj \
-  $(ADDITIONAL)x_MacTurkish.obj \
-  $(ADDITIONAL)Big5.obj \
-  $(ADDITIONAL)Big5_HKSCS.obj \
-  $(ADDITIONAL)EUC_KR.obj \
-  $(ADDITIONAL)GB2312.obj \
-  $(ADDITIONAL)GBK.obj \
-  $(ADDITIONAL)GB18030.obj \
-  $(ADDITIONAL)windows_31j.obj \
-  $(ADDITIONAL)x_MS950_HKSCS.obj \
-  $(ADDITIONAL)x_windows_949.obj 
+  $(HY_BIN)CP_1250.obj \
+  $(HY_BIN)CP_1251.obj \
+  $(HY_BIN)CP_1252.obj \
+  $(HY_BIN)CP_1253.obj \
+  $(HY_BIN)CP_1254.obj \
+  $(HY_BIN)CP_1257.obj \
+  $(HY_BIN)ISO_8859_1.obj \
+  $(HY_BIN)ISO_8859_2.obj \
+  $(HY_BIN)ISO_8859_4.obj \
+  $(HY_BIN)ISO_8859_5.obj \
+  $(HY_BIN)ISO_8859_7.obj \
+  $(HY_BIN)ISO_8859_9.obj \
+  $(HY_BIN)ISO_8859_13.obj \
+  $(HY_BIN)ISO_8859_15.obj \
+  $(HY_BIN)KOI8_R.obj \
+  $(HY_BIN)US_ASCII.obj \
+  $(HY_BIN)IBM866.obj \
+  $(HY_BIN)IBM00858.obj \
+  $(HY_BIN)IBM01140.obj \
+  $(HY_BIN)IBM01141.obj \
+  $(HY_BIN)IBM01142.obj \
+  $(HY_BIN)IBM01143.obj \
+  $(HY_BIN)IBM01144.obj \
+  $(HY_BIN)IBM01145.obj \
+  $(HY_BIN)IBM01146.obj \
+  $(HY_BIN)IBM01147.obj \
+  $(HY_BIN)IBM01148.obj \
+  $(HY_BIN)IBM01149.obj \
+  $(HY_BIN)IBM037.obj \
+  $(HY_BIN)IBM1026.obj \
+  $(HY_BIN)IBM1047.obj \
+  $(HY_BIN)IBM273.obj \
+  $(HY_BIN)IBM277.obj \
+  $(HY_BIN)IBM278.obj \
+  $(HY_BIN)IBM280.obj \
+  $(HY_BIN)IBM284.obj \
+  $(HY_BIN)IBM285.obj \
+  $(HY_BIN)IBM297.obj \
+  $(HY_BIN)IBM420.obj \
+  $(HY_BIN)IBM424.obj \
+  $(HY_BIN)IBM437.obj \
+  $(HY_BIN)IBM500.obj \
+  $(HY_BIN)IBM775.obj \
+  $(HY_BIN)IBM850.obj \
+  $(HY_BIN)IBM852.obj \
+  $(HY_BIN)IBM855.obj \
+  $(HY_BIN)IBM857.obj \
+  $(HY_BIN)IBM860.obj \
+  $(HY_BIN)IBM861.obj \
+  $(HY_BIN)IBM862.obj \
+  $(HY_BIN)IBM863.obj \
+  $(HY_BIN)IBM864.obj \
+  $(HY_BIN)IBM865.obj \
+  $(HY_BIN)IBM868.obj \
+  $(HY_BIN)IBM869.obj \
+  $(HY_BIN)IBM870.obj \
+  $(HY_BIN)IBM871.obj \
+  $(HY_BIN)IBM918.obj \
+  $(HY_BIN)IBM_Thai.obj \
+  $(HY_BIN)ISO_8859_3.obj \
+  $(HY_BIN)ISO_8859_6.obj \
+  $(HY_BIN)ISO_8859_8.obj \
+  $(HY_BIN)windows_1255.obj \
+  $(HY_BIN)windows_1256.obj \
+  $(HY_BIN)x_IBM1006.obj \
+  $(HY_BIN)x_IBM1025.obj \
+  $(HY_BIN)x_IBM1097.obj \
+  $(HY_BIN)x_IBM1098.obj \
+  $(HY_BIN)x_IBM1112.obj \
+  $(HY_BIN)x_IBM1122.obj \
+  $(HY_BIN)x_IBM1123.obj \
+  $(HY_BIN)x_IBM1124.obj \
+  $(HY_BIN)x_IBM737.obj \
+  $(HY_BIN)x_IBM856.obj \
+  $(HY_BIN)x_IBM874.obj \
+  $(HY_BIN)x_IBM875.obj \
+  $(HY_BIN)x_IBM922.obj \
+  $(HY_BIN)x_MacCyrillic.obj \
+  $(HY_BIN)x_MacGreek.obj \
+  $(HY_BIN)x_MacTurkish.obj \
+  $(HY_BIN)Big5.obj \
+  $(HY_BIN)Big5_HKSCS.obj \
+  $(HY_BIN)EUC_KR.obj \
+  $(HY_BIN)GB2312.obj \
+  $(HY_BIN)GBK.obj \
+  $(HY_BIN)GB18030.obj \
+  $(HY_BIN)windows_31j.obj \
+  $(HY_BIN)x_MS950_HKSCS.obj \
+  $(HY_BIN)x_windows_949.obj 
 
 VIRTFILES = hynio_char.res
 
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-  
+
 DLLBASE=0x13200000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,16 +17,16 @@
 # Makefile for module 'common'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\portlib\native\common\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBNAME=$(LIBPATH)hycommon.lib
 
 BUILDFILES = \
-	$(SHAREDSUB)libglob.obj $(SHAREDSUB)iohelp.obj \
-	$(SHAREDSUB)exceptions.obj $(SHAREDSUB)strhelp.obj \
-	$(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj
+ $(HY_BIN)libglob.obj $(HY_BIN)iohelp.obj $(HY_BIN)exceptions.obj \
+ $(HY_BIN)strhelp.obj $(HY_BIN)utf8decode.obj $(HY_BIN)utf8encode.obj
 MDLLIBFILES =
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
-!include <$(HY_HDK)\build\make\rules.mak>
+!include <$(HY_TARGET)\hdk\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,10 +17,11 @@
 # Makefile for module 'pool'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\portlib\native\pool\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBNAME=$(LIBPATH)hypool.lib
-BUILDFILES = $(SHAREDSUB)pool.obj $(SHAREDSUB)pool_cap.obj
+BUILDFILES = $(HY_BIN)pool.obj $(HY_BIN)pool_cap.obj
 MDLLIBFILES =
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'port'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\portlib\native\port\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyprt
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -27,14 +28,16 @@ HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 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 \
-  $(SHAREDSUB)hynls.obj hynlshelpers.obj hyosdump.obj $(SHAREDSUB)hyport.obj \
-  $(SHAREDSUB)hyportcontrol.obj hyportptb.obj hyshmem.obj hyshsem.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
+  $(HY_BIN)port_copyright.obj $(HY_BIN)hycpu.obj $(HY_BIN)hyerror.obj \
+  $(HY_BIN)hyerrorhelpers.obj $(HY_BIN)hyexit.obj $(HY_BIN)hyfile.obj \
+  $(HY_BIN)hyfiletext.obj $(HY_BIN)hygp.obj $(HY_BIN)hyipcmutex.obj \
+  $(HY_BIN)hymem.obj $(HY_BIN)hymmap.obj $(HY_BIN)hynls.obj \
+  $(HY_BIN)hynlshelpers.obj $(HY_BIN)hyosdump.obj $(HY_BIN)hyport.obj \
+  $(HY_BIN)hyportcontrol.obj $(HY_BIN)hyportptb.obj $(HY_BIN)hyshmem.obj \
+  $(HY_BIN)hyshsem.obj $(HY_BIN)hysl.obj $(HY_BIN)hysock.obj \
+  $(HY_BIN)hystr.obj $(HY_BIN)hystrftime.obj $(HY_BIN)hystsl.obj \
+  $(HY_BIN)hysysinfo.obj $(HY_BIN)hytime.obj $(HY_BIN)hytlshelpers.obj \
+  $(HY_BIN)hytty.obj $(HY_BIN)hyvmem.obj
 
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX)
 VIRTFILES = hyprt.res

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,6 +17,7 @@
 # Makefile for module 'thread'
 #
 
+HY_BIN=$(HY_TARGET)\build\classlib\portlib\native\thread\# trailing slash
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hythr
@@ -24,9 +25,10 @@ DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 BUILDFILES = \
-  $(SHAREDSUB)thread_copyright.obj $(HY_PLATFORM)\thrhelp.obj $(HY_PLATFORM)\thrspinlock.obj \
-  $(SHAREDSUB)hythread.obj $(SHAREDSUB)hythreadinspect.obj $(SHAREDSUB)rwmutex.obj thrdsup.obj \
-  $(SHAREDSUB)thrprof.obj $(HY_PLATFORM)\locklbl.obj lock386.obj
+  $(HY_BIN)thread_copyright.obj $(HY_BIN)thrhelp.obj $(HY_BIN)thrspinlock.obj \
+  $(HY_BIN)hythread.obj $(HY_BIN)hythreadinspect.obj $(HY_BIN)rwmutex.obj \
+  $(HY_BIN)thrdsup.obj $(HY_BIN)thrprof.obj \
+  $(HY_BIN)locklbl.obj $(HY_BIN)lock386.obj
 
 # TOFIX $(LIBBASE).def should be a dependency on all libs
 VIRTFILES = $(LIBBASE).res

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/main/native/prefs/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/main/native/prefs/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/main/native/prefs/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'prefs'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\prefs\native\prefs\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyprefs
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -25,7 +26,7 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = prefs_copyright.obj PreferencesImpl.obj
+BUILDFILES = $(HY_BIN)prefs_copyright.obj $(HY_BIN)PreferencesImpl.obj
 
 VIRTFILES = $(LIBBASE).res
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/native/print/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/native/print/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/native/print/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/native/print/windows/makefile Tue Sep 28 22:30:21 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\print\native\print\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=print
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -29,10 +30,8 @@ HYCFLAGS = \
   $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
   -I$(SHAREDSUB)\include
 
-BUILDFILES = print.obj \
-ui.obj \
-win_printer_factory.obj \
-devmode_struct_wrapper.obj
+BUILDFILES = $(HY_BIN)print.obj $(HY_BIN)ui.obj \
+  $(HY_BIN)win_printer_factory.obj $(HY_BIN)devmode_struct_wrapper.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/windows/makefile?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/windows/makefile Tue Sep 28 22:30:21 2010
@@ -17,12 +17,13 @@
 # Makefile for module 'security'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\security\native\security\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hysecurity
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-BUILDFILES = $(SHAREDSUB)security_copyright.obj getWindowsRandom.obj
+BUILDFILES = $(HY_BIN)security_copyright.obj $(HY_BIN)getWindowsRandom.obj
 VIRTFILES = $(LIBBASE).res
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak Tue Sep 28 22:30:21 2010
@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+HY_HDK=$(HY_TARGET)/hdk
 !include <$(HY_HDK)/build/make/properties.mak>
 
 !ifndef APPVER

Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak?rev=1002388&r1=1002387&r2=1002388&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak Tue Sep 28 22:30:21 2010
@@ -21,19 +21,10 @@ ml=ml
 DLLENTRY=@12
 !ENDIF
 
-.c.obj:
-	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
-
-.cpp.obj:
-	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
-
-.asm.obj:
-	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
-
 .rc.res:
 	rc -I..\include $<
 
-all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+all: $(HY_BIN) $(DLLNAME) $(EXENAME) $(LIBNAME)
 
 !ifdef LIBNAME
 $(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
@@ -51,7 +42,7 @@ $(DLLNAME): $(LIBNAME)
 	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
 	-subsystem:windows -out:$@ \
 	-map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
-        -manifestfile:$(LIBPATH)$(*F).manifest \
+	-manifest:no \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
 	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
 	comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
@@ -65,7 +56,7 @@ $(EXENAME): $(BUILDFILES) $(VIRTFILES) $
 	-mkdir $(DBGPATH)
 	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
 	-out:$(EXENAME) -pdb:$(DBGPATH)$(*F).pdb \
-        -manifestfile:$(LIBPATH)$(*F).manifest \
+	-manifest:no \
 	-machine:$(CPU) setargv.obj  \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
 	if exist $(LIBPATH)$(*F).manifest \
@@ -87,3 +78,57 @@ clean:
     -del $(DBGPATH)$(EXEBASE).pdb >nul 2>&1
     -del $(LIBPATH)$(EXEBASE).manifest >nul 2>&1
     -del $(CLEANFILES) >nul 2>&1
+
+$(HY_BIN):
+        -mkdir $(HY_BIN)
+
+# C rules
+{$(HY_PLATFORM)/}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(HY_ARCH)/}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(HY_OS)/}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)additional/}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{.}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(OSS_DIST)}.c{$(HY_BIN)}.obj: # for zlib_dist / fdlibm_dist
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+# C++ rules
+{$(HY_ARCH)/}.cpp{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(HY_OS)/}.cpp{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)}.cpp{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{.}.cpp{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+# assembler rules
+{$(HY_PLATFORM)/}.asm{$(HY_BIN)}.obj:
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{$(HY_ARCH)/}.asm{$(HY_BIN)}.obj:
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{$(HY_OS)/}.asm{$(HY_BIN)}.obj:
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{$(SHAREDSUB)}.asm{$(HY_BIN)}.obj:
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{.}.asm{$(HY_BIN)}.obj:
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<



Mime
View raw message