From c63170c91766036078d5e8ad4efbeac06ecd8f26 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 20 Jun 2014 04:20:26 +0000 Subject: gmake.mk: for love * defs/gmake.mk: add dependencies for love. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- defs/gmake.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/defs/gmake.mk b/defs/gmake.mk index 51991d5f81..3ee34083f6 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -4,6 +4,7 @@ TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS) TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS))) TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS))) TEST_DEPENDS += $(TEST_DEPENDS) $(if $(filter check%,$(MAKECMDGOALS)),main) +TEST_DEPENDS += $(if $(filter all,$(INSTALLDOC)),docs) ifneq ($(filter -O0 -Od,$(optflags)),) override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS)) @@ -28,15 +29,15 @@ $(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\ $(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch))))) endif -ifneq ($(filter check% test,$(MAKECMDGOALS)),) +ifneq ($(filter love check% test,$(MAKECMDGOALS)),) yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample yes-test-sample: $(TEST_DEPENDS) endif -ifneq ($(filter check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),) +ifneq ($(filter love check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),) yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) endif -ifneq ($(filter check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),) +ifneq ($(filter love check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),) yes-test-all yes-test-ruby: yes-test-knownbug endif @@ -51,3 +52,10 @@ ifneq ($(filter reinstall,$(MAKECMDGOALS)),) install-prereq: uninstall uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs) endif + +ifneq ($(filter love,$(MAKECMDGOALS)),) +showflags: up +sudo-precheck: test +install-prereq: sudo-precheck +yes-test-all no-test-all: install +endif -- cgit v1.2.3