equal
deleted
inserted
replaced
47 endif |
47 endif |
48 |
48 |
49 ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX) |
49 ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX) |
50 ACTUAL_PROGRAM_DIR = $(BINDIR) |
50 ACTUAL_PROGRAM_DIR = $(BINDIR) |
51 ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME) |
51 ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME) |
52 |
|
53 JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg |
|
54 |
52 |
55 # Make sure the default rule is all |
53 # Make sure the default rule is all |
56 program_default_rule: all |
54 program_default_rule: all |
57 |
55 |
58 program: $(ACTUAL_PROGRAM) |
56 program: $(ACTUAL_PROGRAM) |
114 COMPILE_IT=false |
112 COMPILE_IT=false |
115 endif |
113 endif |
116 |
114 |
117 ifeq ($(COMPILE_IT),true) |
115 ifeq ($(COMPILE_IT),true) |
118 |
116 |
119 $(ACTUAL_PROGRAM):: classes $(JVMCFG) $(INIT) |
117 $(ACTUAL_PROGRAM):: classes $(INIT) |
120 |
118 |
121 # |
119 # |
122 # Windows only |
120 # Windows only |
123 # |
121 # |
124 ifeq ($(PLATFORM), windows) |
122 ifeq ($(PLATFORM), windows) |
188 @set -- $?; \ |
186 @set -- $?; \ |
189 $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...}; |
187 $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...}; |
190 @$(MKDIR) -p $(TEMPDIR) |
188 @$(MKDIR) -p $(TEMPDIR) |
191 $(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \ |
189 $(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \ |
192 $(FILES_o) $(THREADLIBS) $(LDLIBS) |
190 $(FILES_o) $(THREADLIBS) $(LDLIBS) |
|
191 $(install-module-file) |
193 |
192 |
194 endif # PLATFORM |
193 endif # PLATFORM |
195 |
194 |
196 else # COMPILE_IT |
195 else # COMPILE_IT |
197 |
196 |
198 $(ACTUAL_PROGRAM):: $(JVMCFG) |
197 $(ACTUAL_PROGRAM):: |
199 |
198 |
200 # Copies in the file from the JDK_IMPORT_PATH area |
199 # Copies in the file from the JDK_IMPORT_PATH area |
201 $(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/% |
200 $(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/% |
202 @$(install-import-file) |
201 @$(install-import-file) |
203 $(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/bin/% |
202 $(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/bin/% |
270 @$(prep-target) |
269 @$(prep-target) |
271 $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \ |
270 $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \ |
272 $(VERSION_DEFINES) $< |
271 $(VERSION_DEFINES) $< |
273 |
272 |
274 # |
273 # |
275 # How to install jvm.cfg. |
|
276 # |
|
277 ifeq ($(ZERO_BUILD), true) |
|
278 JVMCFG_ARCH = zero |
|
279 else |
|
280 JVMCFG_ARCH = $(ARCH) |
|
281 endif |
|
282 |
|
283 $(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg |
|
284 $(install-file) |
|
285 |
|
286 # |
|
287 # Default dependencies |
274 # Default dependencies |
288 # |
275 # |
289 |
276 |
290 all: build |
277 all: build |
291 |
278 |