Mercurial > hg > truffle

comparison make/linux/makefiles/defs.make @ 5941:f4767e53d6e0 hs24-b04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Sat, 17 Mar 2012 00:10:12 -0700
parents 2d503de963b3
children 3d7ea1dbe0de
comparison
equal deleted inserted replaced
5932:02ba95965d78 5941:f4767e53d6e0
1 # 1 #
2 # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. 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.
191 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo 191 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
192 endif 192 endif
193 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 193 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
194 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 194 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
195 195
196 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
197
196 ifndef BUILD_CLIENT_ONLY 198 ifndef BUILD_CLIENT_ONLY
197 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 199 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
198 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 200 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
199 ifneq ($(OBJCOPY),) 201 ifneq ($(OBJCOPY),)
200 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 202 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo