From 33818ac694e5872f12e131b6d722655bac153bfd Mon Sep 17 00:00:00 2001
From: Sadek Baroudi <sadekbaroudi@gmail.com>
Date: Mon, 27 May 2024 22:51:25 -0700
Subject: [PATCH] moved generic rules.mk configuration for converting to
 svlinky or xivik into general fingerpunch rules.mk

---
 keyboards/fingerpunch/ffkb/lite/rules.mk | 17 +++++++++--------
 keyboards/fingerpunch/src/rules.mk       | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/keyboards/fingerpunch/ffkb/lite/rules.mk b/keyboards/fingerpunch/ffkb/lite/rules.mk
index dcc9ed4167..8d75b8f772 100644
--- a/keyboards/fingerpunch/ffkb/lite/rules.mk
+++ b/keyboards/fingerpunch/ffkb/lite/rules.mk
@@ -9,15 +9,16 @@
 MCU = atmega32u4
 BOOTLOADER = atmel-dfu
 
-ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v01)
-   VIK_ENABLE = yes
-   OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V01
-endif
+## Moved to keyboards/fingerpunch/src/rules.mk
+# ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v01)
+#    VIK_ENABLE = yes
+#    OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V01
+# endif
 
-ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v02)
-   VIK_ENABLE = yes
-   OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V02
-endif
+# ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v02)
+#    VIK_ENABLE = yes
+#    OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V02
+# endif
 
 # $(info $(MCU))
 # $(info $(BOOTLOADER))
diff --git a/keyboards/fingerpunch/src/rules.mk b/keyboards/fingerpunch/src/rules.mk
index 49a5fe90b7..9b91f9aaa6 100644
--- a/keyboards/fingerpunch/src/rules.mk
+++ b/keyboards/fingerpunch/src/rules.mk
@@ -9,6 +9,27 @@ SRC +=  keyboards/fingerpunch/src/fp.c \
         keyboards/fingerpunch/src/fp_rgblight.c \
         keyboards/fingerpunch/src/fp_rgb_matrix.c
 
+ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v01)
+        VIK_ENABLE = yes
+        OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V01
+endif
+ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v02)
+        VIK_ENABLE = yes
+        OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V02
+endif
+ifeq ($(strip $(FP_CONVERT_TO)), xivik_v01)
+        VIK_ENABLE = yes
+        OPT_DEFS += -DFP_CONVERT_TO_XIVIK_V01
+endif
+ifeq ($(strip $(FP_CONVERT_TO)), xivik_v02)
+        VIK_ENABLE = yes
+        OPT_DEFS += -DFP_CONVERT_TO_XIVIK_V02
+endif
+ifeq ($(strip $(FP_CONVERT_TO)), xivik_v03)
+        VIK_ENABLE = yes
+        OPT_DEFS += -DFP_CONVERT_TO_XIVIK_V03
+endif
+
 ifeq ($(strip $(VIK_ENABLE)), yes)
 	include keyboards/fingerpunch/src/vik/rules.mk
 	OPT_DEFS += -DVIK_ENABLE