[build] Remove DEFAULT

It was redundant with HANDY_TARGETS and HANDY_TARGETS_EXTENSIONS
This commit is contained in:
Romain Goyet
2020-04-02 22:44:22 -04:00
committed by Ecco
parent 99b916e179
commit f7911bae72
5 changed files with 14 additions and 15 deletions

View File

@@ -99,8 +99,7 @@ all_objs = $(call object_for,$(all_src))
include build/targets.mak
# Fill in the default recipe
DEFAULT ?= $(BUILD_DIR)/epsilon.$(EXE)
default: $(DEFAULT)
default: $(firstword $(HANDY_TARGETS)).$(firstword $(HANDY_TARGETS_EXTENSIONS))
# Load standard build rules
include build/rules.mk

View File

@@ -2,13 +2,8 @@
# Those can be built easily by simply invoking "make target.ext". The named file
# will be built in $(BUILD_DIR).
HANDY_TARGETS +=
HANDY_TARGETS_EXTENSIONS += $(EXE)
define handy_target_rule
.PHONY: $(1).$(2)
$(1).$(2): $$(BUILD_DIR)/$(1).$(2)
endef
HANDY_TARGETS ?=
HANDY_TARGETS_EXTENSIONS ?=
# Epsilon base target
@@ -74,6 +69,17 @@ HANDY_TARGETS += test
-include build/targets.$(PLATFORM).mak
# Generate handy targets rules
# Define handy targets
# Those can be built easily by simply invoking "make target.ext". The named file
# will be built in $(BUILD_DIR).
HANDY_TARGETS_EXTENSIONS += $(EXE)
define handy_target_rule
.PHONY: $(1).$(2)
$(1).$(2): $$(BUILD_DIR)/$(1).$(2)
endef
$(foreach extension,$(HANDY_TARGETS_EXTENSIONS),$(foreach executable,$(HANDY_TARGETS),$(eval $(call handy_target_rule,$(executable),$(extension)))))
include build/targets.all.mak

View File

@@ -63,6 +63,4 @@ $(BUILD_DIR)/%.apk: $(apk_deps)
$(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle assembleRelease
$(Q) cp $(BUILD_DIR)/app/outputs/apk/release/android-release*.apk $@
DEFAULT = epsilon.apk
endif

View File

@@ -89,6 +89,4 @@ simulator_app_deps += $(call simulator_app_resource,launch.storyboardc)
include ion/src/simulator/shared/apple/targets.mak
DEFAULT = epsilon.ipa
endif

View File

@@ -43,6 +43,4 @@ simulator_app_deps += $(call simulator_app_resource,app.icns)
include ion/src/simulator/shared/apple/targets.mak
DEFAULT = epsilon.app
endif