harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r536539 - in /harmony/enhanced/classlib/trunk: make/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/archive/windows/ modules/auth/src/main/native/auth/unix/ modules/auth/src/main/native/auth/windows/ modules/a...
Date Wed, 09 May 2007 14:16:52 GMT
Author: odeakin
Date: Wed May  9 07:16:49 2007
New Revision: 536539

URL: http://svn.apache.org/viewvc?view=rev&rev=536539
Log:
Update makefiles to use OS specific linklib.suffix property when linking against libraries.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
    harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed May  9 07:16:49 2007
@@ -443,6 +443,7 @@
                 <env key="HY_NO_SIG" value="${hy.no.sig}" />
                 <env key="HY_NO_THR" value="${hy.no.thr}" />
                 <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
+                <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
             </exec>

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
Wed May  9 07:16:49 2007
@@ -27,8 +27,8 @@
 	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
Wed May  9 07:16:49 2007
@@ -37,9 +37,9 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-	$(LIBPATH)hyzip.lib \
-        $(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-	$(LIBPATH)vmi.lib
+	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
+        $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13100000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile Wed May
 9 07:16:49 2007
@@ -22,8 +22,8 @@
 CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 MDLLIBFILES += \
-        $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+        $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = ../libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile Wed
May  9 07:16:49 2007
@@ -28,9 +28,9 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip.lib \
-	$(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-	$(LIBPATH)vmi.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2006 The Apache Software
Foundation or its licensors, as applicable."
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Wed May 
9 07:16:49 2007
@@ -29,8 +29,8 @@
   libpng.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Wed May
 9 07:16:49 2007
@@ -43,8 +43,8 @@
               Msimg32.lib gdiplus.lib User32.lib uxTheme.lib 
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib \
-  $(LIBPATH)hyzlib.lib $(PNG_DIR)libpng.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"GL native code. (c) Copyright 2005 - 2006 The Apache Software Foundation
or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
Wed May  9 07:16:49 2007
@@ -25,8 +25,8 @@
   libjpeg.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
Wed May  9 07:16:49 2007
@@ -30,7 +30,7 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"JPEGDECODER native code. (c) Copyright 2005 - 2006 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile Wed May
 9 07:16:49 2007
@@ -29,8 +29,8 @@
   liblcms.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Wed
May  9 07:16:49 2007
@@ -35,7 +35,7 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib $(LCMS_DIR)lcms114.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms114$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"LCMM Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Wed
May  9 07:16:49 2007
@@ -25,8 +25,8 @@
 BUILDFILES = LinuxNativeFont.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(XLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Wed
May  9 07:16:49 2007
@@ -22,8 +22,8 @@
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
Wed May  9 07:16:49 2007
@@ -27,7 +27,7 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"OpenGL Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
Wed May  9 07:16:49 2007
@@ -31,7 +31,7 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)

 
 DLLBASE=0x13300000
 COMMENT=/comment:"Win32 Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile Wed
May  9 07:16:49 2007
@@ -30,7 +30,7 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Win32 Font native code. (c) Copyright 2005 - 2006 The Apache Software Foundation
or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Wed
May  9 07:16:49 2007
@@ -25,8 +25,8 @@
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
Wed May  9 07:16:49 2007
@@ -25,8 +25,8 @@
   libjpeg.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
Wed May  9 07:16:49 2007
@@ -37,7 +37,7 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"JPEGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
Wed May  9 07:16:49 2007
@@ -25,8 +25,8 @@
   libpng.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
Wed May  9 07:16:49 2007
@@ -31,8 +31,8 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib \
-  $(LIBPATH)hyzlib.lib $(PNG_DIR)libpng.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"PNGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation
or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
Wed May  9 07:16:49 2007
@@ -27,7 +27,7 @@
 MDLLIBFILES += \
 	$(LIBPATH)libhyzip.a \
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
-	$(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = ../libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
Wed May  9 07:16:49 2007
@@ -33,8 +33,8 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib
+  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
   
 DLLBASE=0x13200000
 COMMENT=/comment:"instrument component native code. (c) Copyright 2006 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile Wed
May  9 07:16:49 2007
@@ -23,7 +23,7 @@
 	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
 	$(SHAREDSUB)libhlp.o
 ifeq ($(HY_NO_THR),false)
-MDLLIBFILES += $(DLLPATH)libhyprt$(HY_SHLIB_SUFFIX)
+MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
 else
 BUILDFILES += main_hlp.o
 endif

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
Wed May  9 07:16:49 2007
@@ -25,7 +25,7 @@
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
         $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
 !IF "$(HY_NO_THR)" == "false"
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 !ELSE
 BUILDFILES = $(BUILDFILES) main_hlp.obj
 !ENDIF

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
Wed May  9 07:16:49 2007
@@ -25,7 +25,7 @@
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
         winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
 !IF "$(HY_NO_THR)" == "false"
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 !ELSE
 BUILDFILES = $(BUILDFILES) main_hlp.obj
 !ENDIF

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile Wed May
 9 07:16:49 2007
@@ -37,8 +37,8 @@
 	OSNetworkSystemLinux.o hyenv.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = ../libhyluni$(HY_SHLIB_SUFFIX)
 EXPNAME = HYLUNI_0.1

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile Wed
May  9 07:16:49 2007
@@ -44,8 +44,8 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib
+  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000
 COMMENT=/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile Wed
May  9 07:16:49 2007
@@ -27,8 +27,8 @@
 
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libaccessors$(HY_SHLIB_SUFFIX)
 EXPNAME=HYMISC_0.1

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
Wed May  9 07:16:49 2007
@@ -30,7 +30,7 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Accessors native code. (c) Copyright 2006 The Apache Software Foundation
or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile Wed May
 9 07:16:49 2007
@@ -32,8 +32,9 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = \
-  $(LIBPATH)hycommon.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+  $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
\
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX)
\
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
   
 DLLBASE=0x13200000
 COMMENT=/comment:"nio component native code. (c) Copyright 1991, 2005 The Apache Software
Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile Wed
May  9 07:16:49 2007
@@ -37,7 +37,7 @@
 endif
 
 ifeq ($(HY_NO_THR),true)
-MDLLIBFILES += $(LIBPATH)libhythr$(HY_SHLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
 endif
 DLLNAME = ../libhyprt$(HY_SHLIB_SUFFIX)
 EXPNAME = HYPRT_0.1

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile
Wed May  9 07:16:49 2007
@@ -40,7 +40,7 @@
 BUILDFILES = $(BUILDFILES) hysignal.obj
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX)
 VIRTFILES = hyprt.res
 
 SYSLIBFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile
Wed May  9 07:16:49 2007
@@ -33,7 +33,7 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
 
-MDLLIBFILES = $(LIBPATH)hypool.lib $(LIBPATH)hycommon.lib
+MDLLIBFILES = $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x11500000
 COMMENT=/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
Wed May  9 07:16:49 2007
@@ -20,7 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)hyerror.o
-MDLLIBFILES += $(DLLPATH)libhyprt.so
+MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
 EXENAME = ../hyerror
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
Wed May  9 07:16:49 2007
@@ -23,7 +23,7 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hyerror.obj
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile Wed
May  9 07:16:49 2007
@@ -20,7 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)hyfile.o
-MDLLIBFILES += $(DLLPATH)libhyprt.so
+MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
 EXENAME = ../hyfile
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
Wed May  9 07:16:49 2007
@@ -23,7 +23,7 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hyfile.obj
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile Wed
May  9 07:16:49 2007
@@ -20,7 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)hytime.o
-MDLLIBFILES += $(DLLPATH)libhyprt.so
+MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
 EXENAME = ../hytime
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
Wed May  9 07:16:49 2007
@@ -23,7 +23,7 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hytime.obj
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile Wed
May  9 07:16:49 2007
@@ -20,7 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)init.o
-MDLLIBFILES += $(DLLPATH)libhyprt.so
+MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
 EXENAME = ../init
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
Wed May  9 07:16:49 2007
@@ -23,7 +23,7 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)init.obj
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile Wed
May  9 07:16:49 2007
@@ -32,8 +32,9 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib
+  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13300000
 COMMENT=/comment:"Preferences component native code. (c) Copyright 1993, 2005 The Apache
Software Foundation or its licensors, as applicable."
 

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile
Wed May  9 07:16:49 2007
@@ -28,7 +28,7 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib
+MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 COMMENT=/comment:"Security component native code. (c) Copyright 2006 The Apache Software
Foundation or its licensors, as applicable."
 

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile Wed May
 9 07:16:49 2007
@@ -25,9 +25,9 @@
 BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
 MDLLIBFILES += \
-	$(DLLPATH)libicuuc$(HY_SHLIB_SUFFIX).34 \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
+	$(DLLPATH)libicuuc$(HY_LINKLIB_SUFFIX).34 \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = ../libhytext$(HY_SHLIB_SUFFIX)
 EXPNAME = HYTEXT_0.1

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile?view=diff&rev=536539&r1=536538&r2=536539
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile Wed
May  9 07:16:49 2007
@@ -29,8 +29,8 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-  $(LIBPATH)vmi.lib $(LIBPATH)icuuc.lib
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LIBPATH)icuuc$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Text component native code. (c) Copyright 1991, 2005 The Apache Software
Foundation or its licensors, as applicable."



Mime
View raw message