433 |
433 |
434 # The db demo contains an empty dir that needs to be copied. The other |
434 # The db demo contains an empty dir that needs to be copied. The other |
435 # directories will always trigger the rule for recompile since |
435 # directories will always trigger the rule for recompile since |
436 # _the.list_of_packages files are touched. |
436 # _the.list_of_packages files are touched. |
437 ifneq ($(findstring images, $(MAKECMDGOALS)), ) |
437 ifneq ($(findstring images, $(MAKECMDGOALS)), ) |
438 $(JDK_IMAGE_DIR)/demo/%: $(SUPPORT_OUTPUTDIR)/demo/image/% |
438 $(JDK_IMAGE_DIR)/demo/%: $(SUPPORT_OUTPUTDIR)/demos/image/% |
439 if [ ! -d "$@" ]; then \ |
439 if [ ! -d "$@" ]; then \ |
440 $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \ |
440 $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \ |
441 $(MKDIR) -p $(@D); \ |
441 $(MKDIR) -p $(@D); \ |
442 if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \ |
442 if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \ |
443 fi |
443 fi |
444 |
444 |
445 # Find all files including directories |
445 # Find all files including directories |
446 JDK_DEMO_TARGETS := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demo/image), \ |
446 JDK_DEMO_TARGETS := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \ |
447 $(patsubst $(SUPPORT_OUTPUTDIR)/demo/image/%, $(JDK_IMAGE_DIR)/demo/%, \ |
447 $(patsubst $(SUPPORT_OUTPUTDIR)/demos/image/%, $(JDK_IMAGE_DIR)/demo/%, \ |
448 $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demo/image \ |
448 $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \ |
449 ! \( -name "_the*" -o -name "javac_state" \) ))) |
449 ! \( -name "_the*" -o -name "javac_state" \) ))) |
450 |
450 |
451 JDK_TARGETS += $(JDK_DEMO_TARGETS) |
451 JDK_TARGETS += $(JDK_DEMO_TARGETS) |
452 endif |
452 endif |
453 |
453 |