From 2d1c985ff44ecfe54fe82021e0326b3c7b07db9f Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 13 Dec 2019 03:36:37 -0800
Subject: [PATCH] core: Fix build config in protocol.mk (#7620)

Backports commits from tmk_keyboard
---
 tmk_core/protocol.mk | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 78b9deb29..0c41642b9 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -1,58 +1,57 @@
 PROTOCOL_DIR = protocol
 
-
-ifdef PS2_MOUSE_ENABLE
+ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
     SRC += $(PROTOCOL_DIR)/ps2_mouse.c
     OPT_DEFS += -DPS2_MOUSE_ENABLE
     OPT_DEFS += -DMOUSE_ENABLE
 endif
 
-ifdef PS2_USE_BUSYWAIT
+ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
     SRC += protocol/ps2_busywait.c
     SRC += protocol/ps2_io_avr.c
     OPT_DEFS += -DPS2_USE_BUSYWAIT
 endif
 
-ifdef PS2_USE_INT
+ifeq ($(strip $(PS2_USE_INT)), yes)
     SRC += protocol/ps2_interrupt.c
     SRC += protocol/ps2_io_avr.c
     OPT_DEFS += -DPS2_USE_INT
 endif
 
-ifdef PS2_USE_USART
+ifeq ($(strip $(PS2_USE_USART)), yes)
     SRC += protocol/ps2_usart.c
     SRC += protocol/ps2_io_avr.c
     OPT_DEFS += -DPS2_USE_USART
 endif
 
 
-ifdef SERIAL_MOUSE_MICROSOFT_ENABLE
+ifeq ($(strip $(SERIAL_MOUSE_MICROSOFT_ENABLE)), yes)
     SRC += $(PROTOCOL_DIR)/serial_mouse_microsoft.c
     OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MICROSOFT \
                 -DMOUSE_ENABLE
 endif
 
-ifdef SERIAL_MOUSE_MOUSESYSTEMS_ENABLE
+ifeq ($(strip $(SERIAL_MOUSE_MOUSESYSTEMS_ENABLE)), yes)
     SRC += $(PROTOCOL_DIR)/serial_mouse_mousesystems.c
     OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MOUSESYSTEMS \
                 -DMOUSE_ENABLE
 endif
 
-ifdef SERIAL_MOUSE_USE_SOFT
+ifeq ($(strip $(SERIAL_MOUSE_USE_SOFT)), yes)
     SRC += $(PROTOCOL_DIR)/serial_soft.c
 endif
 
-ifdef SERIAL_MOUSE_USE_UART
+ifeq ($(strip $(SERIAL_MOUSE_USE_UART)), yes)
     SRC += $(PROTOCOL_DIR)/serial_uart.c
 endif
 
-ifdef ADB_MOUSE_ENABLE
-	 OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
+ifeq ($(strip $(ADB_MOUSE_ENABLE)), yes)
+    OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
 endif
 
-ifdef XT_ENABLE
-  SRC += $(PROTOCOL_DIR)/xt_interrupt.c
-  OPT_DEFS += -DXT_ENABLE
+ifeq ($(strip $(XT_ENABLE)), yes)
+    SRC += $(PROTOCOL_DIR)/xt_interrupt.c
+    OPT_DEFS += -DXT_ENABLE
 endif
 
 # Search Path