harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r950490 - in /harmony/enhanced/java/trunk/classlib/modules: archive/src/main/native/archive/unix/ archive/src/main/native/archive/windows/ archive/src/main/native/zip/unix/ archive/src/main/native/zip/windows/ auth/src/main/native/auth/unix...
Date Wed, 02 Jun 2010 11:01:16 GMT
Author: hindessm
Date: Wed Jun  2 11:01:14 2010
New Revision: 950490

URL: http://svn.apache.org/viewvc?rev=950490&view=rev
Log:
Remove unnecessary linking of hypool static library.

Modified:
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/security/src/main/native/security/windows/makefile

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -37,8 +37,7 @@ MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LI
 endif
 
 MDLLIBFILES += \
-	$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+	$(MDLLIBZLIB) $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -42,7 +42,6 @@ MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)h
 
 MDLLIBFILES = $(MDLLIBFILES) \
         $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
 	$(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13100000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -22,7 +22,11 @@ include $(HY_HDK)/build/make/defines.mk
 INCLUDES += -I../../zlib_dist
 
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
+	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
+
 LIBNAME = $(LIBPATH)libhyzip.a
 
+%.o: $(LIBPATH)libhypool.a(%.o)
+	ar xo $(LIBPATH)libhypool.a $@
+
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -22,7 +22,8 @@
 LIBBASE=hyzip
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
-	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
+	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj \
+        $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
 HYCFLAGS = $(HYCFLAGS) /I..\..\zlib_dist
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/unix/makefile Wed
Jun  2 11:01:14 2010
@@ -25,9 +25,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += \
-        $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/auth/src/main/native/auth/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -33,8 +33,7 @@ MDLLIBFILES = $(MDLLIBFILES) \
 	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -36,8 +36,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += \
-	$(LIBPATH)libhypool.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/fontlib/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -41,9 +41,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib \
-  $(LIBPATH)hyzlib.lib 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi.lib $(LIBPATH)hyzlib.lib 
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/unix/makefile Wed
Jun  2 11:01:14 2010
@@ -39,7 +39,6 @@ MDLLIBFILES += $(LIBPATH)libhyzip.a
 endif
 
 MDLLIBFILES += $(MDLLIBZLIB) \
-	$(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile Wed
Jun  2 11:01:14 2010
@@ -45,7 +45,7 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib \
               Msimg32.lib gdiplus.lib User32.lib uxTheme.lib 
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -25,8 +25,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -30,7 +30,7 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/unix/makefile Wed
Jun  2 11:01:14 2010
@@ -30,8 +30,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -35,7 +35,7 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -30,7 +30,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
+MDLLIBFILES += \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
 	$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -24,8 +24,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -27,7 +27,7 @@ BUILDFILES = $(SHAREDSUB)org_apache_harm
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -31,7 +31,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)

+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) 
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -30,7 +30,8 @@ BUILDFILES = winFont.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib 
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
$(LIBPATH)FL$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LIBPATH)FL$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -27,8 +27,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -29,8 +29,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -41,7 +41,7 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -30,8 +30,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -31,7 +31,7 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -26,9 +26,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a 
 endif
 
-MDLLIBFILES += \
-	$(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -36,8 +36,7 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -21,7 +21,10 @@ include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -I../../include/shared
 BUILDFILES = $(SHAREDSUB)hyzip.o $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
+	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
 LIBNAME = $(LIBPATH)libhyzip.a
 
+%.o: $(LIBPATH)libhypool.a(%.o)
+	ar xo $(LIBPATH)libhypool.a $@
+
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -26,5 +26,6 @@ BUILDFILES = \
 	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\include\shared /I..\..\include\windows
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile Wed
Jun  2 11:01:14 2010
@@ -44,7 +44,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += -lm

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -47,7 +47,7 @@ MDLLIBFILES = $(MDLLIBFILES) \
   $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
+MDLLIBFILES = $(MDLLIBFILES) \
   $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile Wed
Jun  2 11:01:14 2010
@@ -20,7 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
-MDLLIBFILES = $(LIBPATH)libhypool.a
+MDLLIBFILES =
 
 DLLNAME = ../libvmi$(HY_SHLIB_SUFFIX)
 EXPNAME = VMI_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile
Wed Jun  2 11:01:14 2010
@@ -28,8 +28,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libaccessors$(HY_SHLIB_SUFFIX)
 EXPNAME=HYMISC_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -29,8 +29,7 @@ BUILDFILES = \
 VIRTFILES = accessors.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile Wed
Jun  2 11:01:14 2010
@@ -29,9 +29,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a 
 endif
 
-MDLLIBFILES = \
-	$(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a
+MDLLIBFILES = $(LIBPATH)libhycommon.a
 
 DLLNAME = $(DLLPATH)libhynio$(HY_SHLIB_SUFFIX)
 EXPNAME = HYNIO_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -37,7 +37,6 @@ MDLLIBFILES = \
 !ENDIF
 
 MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000

Modified: harmony/enhanced/java/trunk/classlib/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/prefs/src/main/native/prefs/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/prefs/src/main/native/prefs/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/prefs/src/main/native/prefs/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -36,8 +36,7 @@ MDLLIBFILES = \
   $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/trunk/classlib/modules/security/src/main/native/security/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/security/src/main/native/security/windows/makefile?rev=950490&r1=950489&r2=950490&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/security/src/main/native/security/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/security/src/main/native/security/windows/makefile
Wed Jun  2 11:01:14 2010
@@ -28,7 +28,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 
 !include <$(HY_HDK)\build\make\rules.mak>



Mime
View raw message