harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r950038 - in /harmony/enhanced/java/trunk/classlib: depends/build/defines.mk modules/archive/src/main/native/archive/unix/makefile
Date Tue, 01 Jun 2010 12:28:52 GMT
Author: hindessm
Date: Tue Jun  1 12:28:52 2010
New Revision: 950038

URL: http://svn.apache.org/viewvc?rev=950038&view=rev
Log:
Eliminate excessive linking against lib{hy,}zlib.

Modified:
    harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/archive/unix/makefile

Modified: harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/defines.mk?rev=950038&r1=950037&r2=950038&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/defines.mk Tue Jun  1 12:28:52 2010
@@ -79,11 +79,3 @@ endif
 ifeq ($(HY_ZIP_API),true)
 DEFINES += -DHY_ZIP_API
 endif
-
-ifeq ($(HY_LOCAL_ZLIB),true)
-DEFINES += -DHY_LOCAL_ZLIB
-OSLIBS += -lz
-MDLLIBZLIB =
-else
-MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
-endif

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=950038&r1=950037&r2=950038&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
Tue Jun  1 12:28:52 2010
@@ -29,6 +29,13 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES +=	$(LIBPATH)libhyzip.a
 endif
 
+ifeq ($(HY_LOCAL_ZLIB),true)
+DEFINES += -DHY_LOCAL_ZLIB
+OSLIBS += -lz
+else
+MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
 MDLLIBFILES += \
 	$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)



Mime
View raw message