harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r996996 - in /harmony/enhanced/java/trunk/classlib/modules: archive/src/main/native/zip/unix/makefile instrument/src/main/native/instrument/unix/makefile
Date Tue, 14 Sep 2010 17:14:54 GMT
Author: hindessm
Date: Tue Sep 14 17:14:54 2010
New Revision: 996996

URL: http://svn.apache.org/viewvc?rev=996996&view=rev
Log:
Fix instrument so it works with hy.local.zlib=true.

Modified:
    harmony/enhanced/java/trunk/classlib/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile

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=996996&r1=996995&r2=996996&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
Tue Sep 14 17:14:54 2010
@@ -24,6 +24,18 @@ INCLUDES += -I../../zlib_dist
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
 	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
 
+ifeq ($(HY_LOCAL_ZLIB),true)
+DEFINES += -DHY_LOCAL_ZLIB
+else
+
+ifeq ($(HY_OS),zos)
+MDLLIBZLIB += $(LIBPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+else
+MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+endif
+
 LIBNAME = $(LIBPATH)libhyzip.a
 
 %.o: $(LIBPATH)libhypool.a(%.o)

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=996996&r1=996995&r2=996996&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
Tue Sep 14 17:14:54 2010
@@ -26,6 +26,10 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a 
 endif
 
+ifeq ($(HY_LOCAL_ZLIB),true)
+DEFINES += -DHY_LOCAL_ZLIB
+endif
+
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX)



Mime
View raw message