You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/02 20:48:28 UTC
svn commit: r950715 - in /harmony/enhanced/java/trunk/classlib/modules:
awt/src/main/native/fontlib/unix/ awt/src/main/native/fontlib/windows/
awt/src/main/native/gl/unix/ awt/src/main/native/gl/windows/
awt/src/main/native/jpegdecoder/unix/ awt/src/ma...
Author: hindessm
Date: Wed Jun 2 18:48:28 2010
New Revision: 950715
URL: http://svn.apache.org/viewvc?rev=950715&view=rev
Log:
Remove unnecessary linking against the vmi.so.
Also remove unnecessary linking against libstdc++ in libpngencoder.so
on unix.
Modified:
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/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/misc/src/main/native/accessors/unix/makefile
harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -32,8 +32,6 @@ BUILDFILES = \
FontLibExports.o \
$(SHAREDSUB)TypeDefinition.o
-MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
OSLIBS += $(STDCLIBS)
DLLNAME=$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -41,7 +41,7 @@ BUILDFILES = \
VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi.lib $(LIBPATH)hyzlib.lib
+MDLLIBFILES = $(MDLLIBFILES) $(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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -34,9 +34,6 @@ BUILDFILES = \
OSLIBS += -lpng
-MDLLIBFILES += $(MDLLIBZLIB) \
- $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
OSLIBS += $(STDCLIBS) $(XLIBS)
DLLNAME=$(DLLPATH)libgl$(HY_SHLIB_SUFFIX)
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -45,7 +45,6 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib \
Msimg32.lib gdiplus.lib User32.lib uxTheme.lib
MDLLIBFILES = $(MDLLIBFILES) \
- $(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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -21,8 +21,6 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.o
OSLIBS += -ljpeg
-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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -29,8 +29,7 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.obj
VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = $(MDLLIBFILES) \
- $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -26,8 +26,6 @@ BUILDFILES = \
OSLIBS += -llcms
-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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -34,8 +34,7 @@ BUILDFILES = \
VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = $(MDLLIBFILES) \
- $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -26,9 +26,7 @@ endif
BUILDFILES = LinuxNativeFont.o
-MDLLIBFILES += \
- $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
- $(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
OSLIBS += -lm $(XLIBS)
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -20,8 +20,6 @@ INCLUDES += -I$(SHARED)common -I$(SHARED
BUILDFILES = \
$(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
-MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
OSLIBS += $(STDCLIBS)
DLLNAME=$(DLLPATH)liboglwrapper$(HY_SHLIB_SUFFIX)
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -27,8 +27,6 @@ BUILDFILES = $(SHAREDSUB)org_apache_harm
VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-
DLLBASE=0x13300000
!include <$(HY_HDK)\build\make\rules.mak>
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -23,8 +23,6 @@ BUILDFILES = \
org_apache_harmony_awt_nativebridge_linux_X11.o \
org_apache_harmony_awt_nativebridge_linux_Xft.o
-MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
OSLIBS += $(STDCLIBS) $(XLIBS)
DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -25,8 +25,6 @@ else
MDLLIBFILES += $(LIBPATH)libjpeg.a
endif
-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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -40,8 +40,7 @@ BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = $(MDLLIBFILES) \
- $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -26,14 +26,6 @@ MDLLIBFILES += $(LIBPATH)libpng.a
DEFINES += -DPNGAPI=
endif
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
-OSLIBS += $(STDCLIBS)
-
ifeq ($(HY_OS),zos)
MDLLIBFILES += $(MDLLIBZLIB)
endif
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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -31,7 +31,6 @@ VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = $(MDLLIBFILES) \
- $(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/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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -24,8 +24,6 @@ BUILDFILES = \
$(SHAREDSUB)org_apache_harmony_misc_accessors_ObjectAccessorImpl.o \
$(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.o
-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=950715&r1=950714&r2=950715&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 18:48:28 2010
@@ -29,8 +29,6 @@ BUILDFILES = \
VIRTFILES = accessors.res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-
DLLBASE=0x13300000
!include <$(HY_HDK)\build\make\rules.mak>