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

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) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 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.
366 include $(MAKEFILES_DIR)/jsig.make 366 include $(MAKEFILES_DIR)/jsig.make
367 367
368 # Serviceability agent 368 # Serviceability agent
369 include $(MAKEFILES_DIR)/saproc.make 369 include $(MAKEFILES_DIR)/saproc.make
370 370
371 #---------------------------------------------------------------------- 371 # Whitebox testing API
372 372 include $(MAKEFILES_DIR)/wb.make
373 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) 373
374 #----------------------------------------------------------------------
375
376 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR)
374 377
375 install: install_jvm install_jsig install_saproc 378 install: install_jvm install_jsig install_saproc
376 379
377 .PHONY: default build install install_jvm 380 .PHONY: default build install install_jvm