From dd95872b21039f82fd7a631f55f4f254d5cc3bda Mon Sep 17 00:00:00 2001
From: Sylvain PILLOT <pillot.sylvain@gmail.com>
Date: Wed, 14 Feb 2024 21:13:22 +0100
Subject: [PATCH] removed 2 unnecessary files

---
 ports/sh/Makefile               | 20 ++++++++--------
 ports/sh/ulab/micropython.cmake | 18 ---------------
 ports/sh/ulab/micropython.mk    | 41 ---------------------------------
 3 files changed, 11 insertions(+), 68 deletions(-)
 delete mode 100644 ports/sh/ulab/micropython.cmake
 delete mode 100644 ports/sh/ulab/micropython.mk

diff --git a/ports/sh/Makefile b/ports/sh/Makefile
index aa681766a..ebaf612c0 100644
--- a/ports/sh/Makefile
+++ b/ports/sh/Makefile
@@ -34,13 +34,20 @@ SRC_QSTR += \
 
 ifeq ($(TARGETCASIO),"FXCG50")
     $(info ************  FXCG50 VERSION ************ )
+
     $(info *********  Add Numworks modules ********* )  
     SRC_C += \
         ports/sh/numworks/modkandinsky.c \
         ports/sh/numworks/ion.c \
         ports/sh/numworks/time.c
 
-    CFLAGS_EXTRA += -DMODULE_ULAB_ENABLED=1
+    SRC_QSTR += \
+        ports/sh/numworks/modkandinsky.c \
+        ports/sh/numworks/ion.c \
+        ports/sh/numworks/time.c
+
+    $(info ***********  Add µlab modules *********** )  
+    CFLAGS_EXTRA += -DMODULE_ULAB_ENABLED=1    
     
     SRC_C += \
         ports/sh/ulab/scipy/linalg/linalg.c \
@@ -74,13 +81,7 @@ ifeq ($(TARGETCASIO),"FXCG50")
         ports/sh/ulab/scipy/scipy.c \
         ports/sh/ulab/user/user.c \
         ports/sh/ulab/utils/utils.c \
-        ports/sh/ulab/ulab.c \
- 
-
-    SRC_QSTR += \
-        ports/sh/numworks/modkandinsky.c \
-        ports/sh/numworks/ion.c \
-        ports/sh/numworks/time.c
+        ports/sh/ulab/ulab.c
 
     SRC_QSTR += \
         ports/sh/ulab/scipy/linalg/linalg.c \
@@ -114,13 +115,14 @@ ifeq ($(TARGETCASIO),"FXCG50")
         ports/sh/ulab/scipy/scipy.c \
         ports/sh/ulab/user/user.c \
         ports/sh/ulab/utils/utils.c \
-        ports/sh/ulab/ulab.c \
+        ports/sh/ulab/ulab.c
     
 endif
 
 ifeq ($(TARGETCASIO),"FX9860G")
     $(info ***********  FX9860G  VERSION *********** )
 
+
 endif
 
 
diff --git a/ports/sh/ulab/micropython.cmake b/ports/sh/ulab/micropython.cmake
deleted file mode 100644
index 66890c0db..000000000
--- a/ports/sh/ulab/micropython.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-add_library(usermod_ulab INTERFACE)
-
-file(GLOB_RECURSE ULAB_SOURCES ${CMAKE_CURRENT_LIST_DIR}/*.c)
-
-target_sources(usermod_ulab INTERFACE
-    ${ULAB_SOURCES}
-)
-
-target_include_directories(usermod_ulab INTERFACE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-
-target_compile_definitions(usermod_ulab INTERFACE
-    MODULE_ULAB_ENABLED=1
-)
-
-target_link_libraries(usermod INTERFACE usermod_ulab)
-
diff --git a/ports/sh/ulab/micropython.mk b/ports/sh/ulab/micropython.mk
deleted file mode 100644
index 4aa6f615e..000000000
--- a/ports/sh/ulab/micropython.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-
-USERMODULES_DIR := $(USERMOD_DIR)
-
-# Add all C files to SRC_USERMOD.
-SRC_USERMOD += $(USERMODULES_DIR)/scipy/linalg/linalg.c
-SRC_USERMOD += $(USERMODULES_DIR)/scipy/optimize/optimize.c
-SRC_USERMOD += $(USERMODULES_DIR)/scipy/signal/signal.c
-SRC_USERMOD += $(USERMODULES_DIR)/scipy/special/special.c
-SRC_USERMOD += $(USERMODULES_DIR)/ndarray_operators.c
-SRC_USERMOD += $(USERMODULES_DIR)/ulab_tools.c
-SRC_USERMOD += $(USERMODULES_DIR)/ndarray.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/ndarray/ndarray_iter.c
-SRC_USERMOD += $(USERMODULES_DIR)/ndarray_properties.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/approx.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/bitwise.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/compare.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/carray/carray.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/carray/carray_tools.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/create.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/fft/fft.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/fft/fft_tools.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/filter.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/io/io.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/linalg/linalg.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/linalg/linalg_tools.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/numerical.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/poly.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/random/random.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/stats.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/transform.c
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/vector.c
-
-SRC_USERMOD += $(USERMODULES_DIR)/numpy/numpy.c
-SRC_USERMOD += $(USERMODULES_DIR)/scipy/scipy.c
-SRC_USERMOD += $(USERMODULES_DIR)/user/user.c
-SRC_USERMOD += $(USERMODULES_DIR)/utils/utils.c
-SRC_USERMOD += $(USERMODULES_DIR)/ulab.c
-
-CFLAGS_USERMOD += -I$(USERMODULES_DIR)
-
-override CFLAGS_EXTRA += -DMODULE_ULAB_ENABLED=1