equal
deleted
inserted
replaced
247 ifeq ($(ARCH),ia64) |
247 ifeq ($(ARCH),ia64) |
248 BUILD_WIN_SA = 0 |
248 BUILD_WIN_SA = 0 |
249 endif |
249 endif |
250 endif |
250 endif |
251 |
251 |
252 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server |
252 EXPORT_SERVER_DIR = $(EXPORT_BIN_DIR)/server |
253 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client |
253 EXPORT_CLIENT_DIR = $(EXPORT_BIN_DIR)/client |
254 |
254 |
255 ifeq ($(JVM_VARIANT_SERVER),true) |
255 ifeq ($(JVM_VARIANT_SERVER),true) |
256 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
256 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
257 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) |
257 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) |
258 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
258 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
278 endif |
278 endif |
279 |
279 |
280 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib |
280 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib |
281 |
281 |
282 ifeq ($(BUILD_WIN_SA), 1) |
282 ifeq ($(BUILD_WIN_SA), 1) |
283 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) |
283 EXPORT_LIST += $(EXPORT_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) |
284 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
284 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
285 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
285 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
286 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.diz |
286 EXPORT_LIST += $(EXPORT_BIN_DIR)/sawindbg.diz |
287 else |
287 else |
288 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb |
288 EXPORT_LIST += $(EXPORT_BIN_DIR)/sawindbg.pdb |
289 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map |
289 EXPORT_LIST += $(EXPORT_BIN_DIR)/sawindbg.map |
290 endif |
290 endif |
291 endif |
291 endif |
292 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |
292 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |
293 # Must pass this down to nmake. |
293 # Must pass this down to nmake. |
294 MAKE_ARGS += BUILD_WIN_SA=1 |
294 MAKE_ARGS += BUILD_WIN_SA=1 |