equal
deleted
inserted
replaced
25 |
25 |
26 default: all |
26 default: all |
27 |
27 |
28 include $(SPEC) |
28 include $(SPEC) |
29 include MakeBase.gmk |
29 include MakeBase.gmk |
|
30 include Modules.gmk |
30 |
31 |
31 TOOL_TARGETS := |
32 TOOL_TARGETS := |
32 JDK_TARGETS := |
33 JDK_TARGETS := |
33 JRE_TARGETS := |
34 JRE_TARGETS := |
34 |
35 |
37 |
38 |
38 ############################################################################ |
39 ############################################################################ |
39 |
40 |
40 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \ |
41 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \ |
41 jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \ |
42 jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \ |
42 jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell \ |
43 jdk.accessibility jdk.internal.le jdk.dynalink \ |
|
44 jdk.scripting.nashorn jdk.scripting.nashorn.shell \ |
43 jdk.vm.ci jdk.management |
45 jdk.vm.ci jdk.management |
44 |
46 |
45 # providers |
47 # providers |
46 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \ |
48 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.jvmstat.rmi \ |
47 jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs |
49 jdk.localedata jdk.naming.dns jdk.naming.rmi jdk.zipfs |
48 |
50 |
49 # tools |
51 # tools |
50 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \ |
52 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \ |
51 jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \ |
53 jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \ |
52 jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.jshell jdk.policytool jdk.rmic \ |
54 jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.jshell jdk.policytool jdk.rmic \ |
62 |
64 |
63 ifeq ($(OPENJDK_TARGET_OS), macosx) |
65 ifeq ($(OPENJDK_TARGET_OS), macosx) |
64 MAIN_MODULES += jdk.deploy.osx |
66 MAIN_MODULES += jdk.deploy.osx |
65 endif |
67 endif |
66 |
68 |
67 JRE_MODULES := $(MAIN_MODULES) $(PROVIDER_MODULES) |
69 JRE_MODULES := $(filter-out $(MODULES_FILTER), $(MAIN_MODULES) $(PROVIDER_MODULES)) |
68 JDK_MODULES := $(JRE_MODULES) $(TOOLS_MODULES) |
70 JDK_MODULES := $(filter-out $(MODULES_FILTER), $(JRE_MODULES) $(TOOLS_MODULES)) |
69 |
71 |
70 # compact3 builds have additional modules |
72 # compact3 builds have additional modules |
71 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \ |
73 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \ |
72 jdk.naming.rmi jdk.sctp jdk.security.auth jdk.management |
74 jdk.naming.rmi jdk.sctp jdk.security.auth jdk.management |
73 |
75 |
508 $(JDK_TARGETS): $(TOOL_JDK_TARGETS) |
510 $(JDK_TARGETS): $(TOOL_JDK_TARGETS) |
509 |
511 |
510 jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) \ |
512 jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) \ |
511 $(SYMBOLS_TARGETS) |
513 $(SYMBOLS_TARGETS) |
512 |
514 |
513 |
|
514 $(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS) |
515 $(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS) |
515 $(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS) |
516 $(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS) |
516 $(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS) |
517 $(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS) |
517 |
518 |
518 profiles: $(TOOL_JRE_COMPACT1_TARGETS) \ |
519 profiles: $(TOOL_JRE_COMPACT1_TARGETS) \ |