From f64f1f4b2ff2597119ca34fab86f6a40afe10f2c Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Fri, 4 Jul 2025 10:59:33 -0400 Subject: [PATCH] tweak Makefile checks, no need for BOARD or DISPLAY to make install --- Makefile | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index de7be3b..39b6d86 100644 --- a/Makefile +++ b/Makefile @@ -27,24 +27,28 @@ endef # Only require BOARD and DISPLAY for non-clean targets ifeq (,$(filter clean,$(MAKECMDGOALS))) -ifndef BOARD - $(error Build failed: BOARD not defined. Use one of the four options below, depending on your hardware:$n$n make BOARD=sensorwatch_red DISPLAY=display_type$n make BOARD=sensorwatch_blue DISPLAY=display_type$n make BOARD=sensorwatch_pro DISPLAY=display_type$n$n) -endif + ifeq (,$(filter install,$(MAKECMDGOALS))) + ifndef BOARD + $(error Build failed: BOARD not defined. Use one of the four options below, depending on your hardware:$n$n make BOARD=sensorwatch_red DISPLAY=display_type$n make BOARD=sensorwatch_blue DISPLAY=display_type$n make BOARD=sensorwatch_pro DISPLAY=display_type$n$n) + endif + endif -ifndef DISPLAY - $(error Build failed: DISPLAY not defined. Use one of the options below, depending on your hardware:$n$n make BOARD=board_type DISPLAY=classic$n make BOARD=board_type DISPLAY=custom$n$n) -else - ifeq ($(DISPLAY), custom) - DEFINES += -DFORCE_CUSTOM_LCD_TYPE - else ifeq ($(DISPLAY), classic) - DEFINES += -DFORCE_CLASSIC_LCD_TYPE - else ifeq ($(DISPLAY), autodetect) - $(warning WARNING: LCD autodetection is experimental and not reliable! We suggest specifying DISPLAY=classic or DISPLAY=custom for reliable operation.) - else - $(error Build failed: invalid DISPLAY type. Use one of the options below, depending on your hardware:$n$n make BOARD=board_type DISPLAY=classic$n make BOARD=board_type DISPLAY=custom$n$n) + ifeq (,$(filter install,$(MAKECMDGOALS))) + ifndef DISPLAY + $(error Build failed: DISPLAY not defined. Use one of the options below, depending on your hardware:$n$n make BOARD=board_type DISPLAY=classic$n make BOARD=board_type DISPLAY=custom$n$n) + else + ifeq ($(DISPLAY), custom) + DEFINES += -DFORCE_CUSTOM_LCD_TYPE + else ifeq ($(DISPLAY), classic) + DEFINES += -DFORCE_CLASSIC_LCD_TYPE + else ifeq ($(DISPLAY), autodetect) + $(warning WARNING: LCD autodetection is experimental and not reliable! We suggest specifying DISPLAY=classic or DISPLAY=custom for reliable operation.) + else + $(error Build failed: invalid DISPLAY type. Use one of the options below, depending on your hardware:$n$n make BOARD=board_type DISPLAY=classic$n make BOARD=board_type DISPLAY=custom$n$n) + endif + endif endif endif -endif ifdef NOSLEEP DEFINES += -DMOVEMENT_LOW_ENERGY_MODE_FORBIDDEN -- 2.39.5