comparison make/defs.make @ 1185:3908ad124838

Merge
author dcubed
date Wed, 20 Jan 2010 11:32:41 -0700
parents 354d3184f6b2 7fbf850d87b7
children c18cbe5936b8
comparison
equal deleted inserted replaced
1161:1fc01a2425ce 1185:3908ad124838
1 # 1 #
2 # Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. 2 # Copyright 2006-2010 Sun Microsystems, Inc. All Rights Reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
259 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib 259 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
260 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) 260 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
261 261
262 # Common export list of files 262 # Common export list of files
263 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h 263 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
264 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
264 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 265 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
265 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 266 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
266 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 267 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h