harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r950551 - in /harmony/enhanced/java/trunk/classlib/modules: auth/src/main/native/auth/unix/ auth/src/main/native/auth/windows/ awt/src/main/native/fontlib/unix/ awt/src/main/native/gl/unix/ awt/src/main/native/jpegdecoder/unix/ awt/src/main...
Date Wed, 02 Jun 2010 13:04:04 GMT
Author: hindessm
Date: Wed Jun  2 13:04:03 2010
New Revision: 950551

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

Modified:
    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/gl/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/unix/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/x11wrapper/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/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/luni/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/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

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -21,10 +21,6 @@ include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -28,11 +28,6 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) \
-	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -32,10 +32,6 @@ BUILDFILES = \
   FontLibExports.o \
   $(SHAREDSUB)TypeDefinition.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -34,10 +34,6 @@ BUILDFILES = \
 
 OSLIBS += -lpng
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a
-endif
-
 MDLLIBFILES += $(MDLLIBZLIB) \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -21,10 +21,6 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.o
 
 OSLIBS += -ljpeg
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -26,10 +26,6 @@ BUILDFILES = \
 
 OSLIBS += -llcms
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)liblcmm$(HY_SHLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -26,10 +26,6 @@ endif
 
 BUILDFILES = LinuxNativeFont.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -20,10 +20,6 @@ INCLUDES += -I$(SHARED)common -I$(SHARED
 BUILDFILES = \
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -23,10 +23,6 @@ BUILDFILES = \
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -25,10 +25,6 @@ else
 MDLLIBFILES += $(LIBPATH)libjpeg.a
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libjpegencoder$(HY_SHLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -33,7 +33,8 @@ VIRTFILES = hyinstrument.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 !IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
+              $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -40,10 +40,6 @@ BUILDFILES = \
 	$(SHAREDSUB)OSMemory.o OSMemoryLinux32.o $(SHAREDSUB)OSNetworkSystem.o \
 	OSNetworkSystemLinux.o hyenv.o 
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -42,11 +42,6 @@ VIRTFILES = hyluni.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
 MDLLIBFILES = $(MDLLIBFILES) \
   $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -24,10 +24,6 @@ BUILDFILES = \
   $(SHAREDSUB)org_apache_harmony_misc_accessors_ObjectAccessorImpl.o \
   $(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libaccessors$(HY_SHLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -25,10 +25,6 @@ ifeq ($(HY_OS),linux)
 BUILDFILES += EpollSelectorImpl.o
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a 
-endif
-
 MDLLIBFILES = $(LIBPATH)libhycommon.a
 
 DLLNAME = $(DLLPATH)libhynio$(HY_SHLIB_SUFFIX)

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -31,11 +31,6 @@ VIRTFILES = hynio.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
 MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 

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=950551&r1=950550&r2=950551&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 13:04:03 2010
@@ -31,11 +31,6 @@ VIRTFILES = $(LIBBASE).res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13300000
 



Mime
View raw message