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 |
62 |
63 |
63 ifeq ($(OPENJDK_TARGET_OS), macosx) |
64 ifeq ($(OPENJDK_TARGET_OS), macosx) |
64 MAIN_MODULES += jdk.deploy.osx |
65 MAIN_MODULES += jdk.deploy.osx |
65 endif |
66 endif |
66 |
67 |
67 JRE_MODULES := $(MAIN_MODULES) $(PROVIDER_MODULES) |
68 JRE_MODULES := $(filter-out $(MODULES_FILTER), $(MAIN_MODULES) $(PROVIDER_MODULES)) |
68 JDK_MODULES := $(JRE_MODULES) $(TOOLS_MODULES) |
69 JDK_MODULES := $(filter-out $(MODULES_FILTER), $(JRE_MODULES) $(TOOLS_MODULES)) |
69 |
70 |
70 # compact3 builds have additional modules |
71 # compact3 builds have additional modules |
71 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \ |
72 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \ |
72 jdk.naming.rmi jdk.sctp jdk.security.auth jdk.management |
73 jdk.naming.rmi jdk.sctp jdk.security.auth jdk.management |
73 |
74 |