Mercurial > hg > graal-jvmci-8

comparison make/windows/makefiles/generated.make @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents f2110083203d
children
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
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