Mercurial > hg > truffle

comparison make/Makefile @ 2184:5d801e6b9a80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Imported build system changes from other repository.
author Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date Mon, 21 Feb 2011 19:17:10 +0100
parents 2d26b0046e0d
children 0cd39a385a72
comparison
equal deleted inserted replaced
2183:eed52202caea 2184:5d801e6b9a80
71 include $(GAMMADIR)/make/defs.make 71 include $(GAMMADIR)/make/defs.make
72 else 72 else
73 include defs.make 73 include defs.make
74 endif 74 endif
75 75
76 include $(GAMMADIR)/make/altsrc.make
76 77
77 ifneq ($(ALT_OUTPUTDIR),) 78 ifneq ($(ALT_OUTPUTDIR),)
78 ALT_OUT=ALT_OUTPUTDIR=$(ALT_OUTPUTDIR) 79 ALT_OUT=ALT_OUTPUTDIR=$(ALT_OUTPUTDIR)
79 else 80 else
80 ALT_OUT= 81 ALT_OUT=
162 $(MAKE_ARGS) $(VM_TARGET:%1=%) 163 $(MAKE_ARGS) $(VM_TARGET:%1=%)
163 else 164 else
164 @$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 165 @$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
165 endif 166 endif
166 else 167 else
167 # ifeq ($(ARCH_DATA_MODEL), 32) 168 ifeq ($(ARCH_DATA_MODEL), 32)
168 $(CD) $(OUTPUTDIR); \ 169 $(CD) $(OUTPUTDIR); \
169 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 170 $(MAKE) -f $(ABS_OS_MAKEFILE) \
170 $(MAKE_ARGS) $(VM_TARGET) 171 $(MAKE_ARGS) $(VM_TARGET)
171 # else 172 else
172 # @$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 173 @$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
173 # endif 174 endif
174 endif 175 endif
175 176
176 # Build compiler2 (server) rule, different for platforms 177 # Build compiler2 (server) rule, different for platforms
177 generic_build2: 178 generic_build2:
178 $(MKDIR) -p $(OUTPUTDIR) 179 $(MKDIR) -p $(OUTPUTDIR)
359 $(install-file) 360 $(install-file)
360 361
361 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/% 362 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/%
362 $(install-file) 363 $(install-file)
363 364
364 $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_SRC_DIR)/cpu/$(HS_ARCH)/vm/jni_$(HS_ARCH).h 365 HS_JNI_ARCH_SRC=$(call altsrc-replace,$(HS_COMMON_SRC)/cpu/$(HS_ARCH)/vm/jni_$(HS_ARCH).h)
366 $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_JNI_ARCH_SRC)
365 $(install-file) 367 $(install-file)
366 368
367 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/services/% 369 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/services/%
368 $(install-file) 370 $(install-file)
369 371
370 # Doc files (jvmti.html) 372 # Doc files (jvmti.html)
371 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/% 373 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
372 $(install-file) 374 $(install-file)
373 375
374 # Xusage file 376 # Xusage file
375 #$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE) 377 $(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
376 # $(prep-target) 378 $(prep-target)
377 # $(RM) $@.temp 379 $(RM) $@.temp
378 # $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp 380 $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
379 # $(MV) $@.temp $@ 381 $(MV) $@.temp $@
380 382
381 # 383 #
382 # Clean rules 384 # Clean rules
383 # 385 #
384 clobber clean: clean_build clean_export clean_jdk 386 clobber clean: clean_build clean_export clean_jdk