aboutsummaryrefslogtreecommitdiffstats
path: root/java/jdk14/files/patch-j2se::zip::Makefile
blob: ed15182c29ccdaf5033a8ce32253c2b3a94783a8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
--- ../../j2se/make/java/zip/Makefile.orig  Wed Sep 10 19:43:01 2003
+++ ../../j2se/make/java/zip/Makefile   Sat Feb 11 00:55:54 2006
@@ -12,8 +12,6 @@
 PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
-ZLIB_VERSION = 1.1.3
-
 #
 # Files to compile.
 #
@@ -58,13 +56,6 @@
 CPPFLAGS += -UDEBUG 
 endif
 
-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
-
 #
 # Has been converted to the JNI: generate JNI-style header files
 #
@@ -73,4 +64,4 @@
 #
 # Link to JVM library for JVM_Zip* functions
 #
-OTHER_LDLIBS = $(JVMLIB)
+OTHER_LDLIBS = -lz