comparison make/windows/makefiles/generated.make @ 10405:f2110083203d

8005849: JEP 167: Event-Based JVM Tracing Reviewed-by: acorn, coleenp, sla Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author sla
date Mon, 10 Jun 2013 11:30:51 +0200
parents aa6e219afbf1
children
comparison
equal deleted inserted replaced
10404:d0add7016434 10405:f2110083203d
1 # 1 #
2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2013, 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.
28 28
29 # Pick up rules for building JVMTI (JSR-163) 29 # Pick up rules for building JVMTI (JSR-163)
30 JvmtiOutDir=jvmtifiles 30 JvmtiOutDir=jvmtifiles
31 !include $(WorkSpace)/make/windows/makefiles/jvmti.make 31 !include $(WorkSpace)/make/windows/makefiles/jvmti.make
32 32
33 # Pick up rules for building trace
34 TraceOutDir=tracefiles
35 !include $(WorkSpace)/make/windows/makefiles/trace.make
36
33 # Pick up rules for building SA 37 # Pick up rules for building SA
34 !include $(WorkSpace)/make/windows/makefiles/sa.make 38 !include $(WorkSpace)/make/windows/makefiles/sa.make
35 39
36 AdlcOutDir=adfiles 40 AdlcOutDir=adfiles
37 41
38 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") 42 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
39 default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles 43 default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles
40 !else 44 !else
41 default:: $(JvmtiGeneratedFiles) buildobjfiles 45 default:: $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles
42 !endif 46 !endif
43 47
44 buildobjfiles: 48 buildobjfiles:
45 @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) . > objfiles.make 49 @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) . > objfiles.make
46 50