diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-04-07 03:27:34 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-04-07 03:27:34 +0000 |
| commit | e81e856fc6098f97aa3bf4fd90c1f94952213126 (patch) | |
| tree | 795e0052a57cab4c476e5782c34fafe6e64a8923 /java/jdk15/files/patch-j2se::instrument::Makefile | |
| parent | Upgrade to 1.1.8. (diff) | |
. Update to 1.5.0 patchset 3.
Notes
Notes:
svn path=/head/; revision=158993
Diffstat (limited to 'java/jdk15/files/patch-j2se::instrument::Makefile')
| -rw-r--r-- | java/jdk15/files/patch-j2se::instrument::Makefile | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile index 2ce0f43ea3e3..8934bfc11fe3 100644 --- a/java/jdk15/files/patch-j2se::instrument::Makefile +++ b/java/jdk15/files/patch-j2se::instrument::Makefile @@ -2,35 +2,8 @@ $FreeBSD$ --- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005 +++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005 -@@ -39,5 +39,4 @@ - # into the instrument library. - # --ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 - IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io - LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin -@@ -45,12 +44,4 @@ - - FILES_c += \ -- inflate.c \ -- infblock.c \ -- infcodes.c \ -- inffast.c \ -- inftrees.c \ -- zadler32.c \ -- infutil.c \ -- zutil.c \ - canonicalize_md.c \ - parse_manifest.c -@@ -61,5 +60,4 @@ - OTHER_INCLUDES = -I$(SHARE_SRC)/instrument - OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument --OTHER_INCLUDES += -I$(ZIP_SRC) - OTHER_INCLUDES += -I$(IO_PLATFORM_SRC) - OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC) -@@ -71,9 +61,10 @@ - COMPILER_WARNING_LEVEL=0 +@@ -72,8 +72,8 @@ else -+OTHER_LDLIBS += -lz ifeq ($(PLATFORM), bsd) ifneq ($(TRUE_PLATFORM), NetBSD) - OTHER_INCLUDES += -I/usr/local/include @@ -40,9 +13,3 @@ $FreeBSD$ endif else OTHER_LDLIBS = -lnsl -ldl -@@ -123,5 +121,4 @@ - # - vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument --vpath %.c $(ZIP_SRC) - vpath %.c $(IO_PLATFORM_SRC) - vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) |