Restructure RIOT make

lf-lang · Oct 18, 2024 · ea4a2e6 · ea4a2e6
1 parent afba777
commit ea4a2e6
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 20 deletions.
diff --git a/examples/riot/blinky/Makefile b/examples/riot/blinky/Makefile
@@ -0,0 +1,15 @@
+# name of your application
+APPLICATION = lf-test
+
+# If no BOARD is found in the environment, use this default:
+BOARD ?= native
+
+# Comment this out to disable code in RIOT that does safety checking
+# which is not needed in a production environment but helps in the
+# development process:
+DEVELHELP ?= 1
+
+# Change this to 0 show compiler invocation lines by default:
+QUIET ?= 1
+
+include $(CURDIR)/../../../make/riot/riot.mk
diff --git a/examples/riot/src/blinky/main.c → examples/riot/blinky/main.c b/examples/riot/src/blinky/main.c → examples/riot/blinky/main.c
diff --git a/examples/riot/external_modules/nanopb/Makefile b/examples/riot/external_modules/nanopb/Makefile
diff --git a/examples/riot/external_modules/proto/Makefile b/examples/riot/external_modules/proto/Makefile
diff --git a/examples/riot/external_modules/reactor-uc/Makefile b/examples/riot/external_modules/reactor-uc/Makefile
diff --git a/examples/riot/src/blinky/Makefile → ...ting_posix_tcp_ip_channel_client/Makefile b/examples/riot/src/blinky/Makefile → ...ting_posix_tcp_ip_channel_client/Makefile
diff --git a/...esting_posix_tcp_ip_channel_client/main.c → ...esting_posix_tcp_ip_channel_client/main.c b/...esting_posix_tcp_ip_channel_client/main.c → ...esting_posix_tcp_ip_channel_client/main.c
diff --git a/...ting_posix_tcp_ip_channel_client/Makefile → ...ting_posix_tcp_ip_channel_server/Makefile b/...ting_posix_tcp_ip_channel_client/Makefile → ...ting_posix_tcp_ip_channel_server/Makefile
diff --git a/...esting_posix_tcp_ip_channel_server/main.c → ...esting_posix_tcp_ip_channel_server/main.c b/...esting_posix_tcp_ip_channel_server/main.c → ...esting_posix_tcp_ip_channel_server/main.c
diff --git a/...ting_posix_tcp_ip_channel_server/Makefile → ...g_tcp_ip_channel_server_callback/Makefile b/...ting_posix_tcp_ip_channel_server/Makefile → ...g_tcp_ip_channel_server_callback/Makefile
diff --git a/...ing_tcp_ip_channel_server_callback/main.c → ...ing_tcp_ip_channel_server_callback/main.c b/...ing_tcp_ip_channel_server_callback/main.c → ...ing_tcp_ip_channel_server_callback/main.c
diff --git a/make/riot/external_modules/nanopb/Makefile b/make/riot/external_modules/nanopb/Makefile
@@ -0,0 +1,6 @@
+include $(RIOTBASE)/Makefile.base
+
+SRC_DIR := $(realpath $(CURDIR)/../../../../external/nanopb)
+
+all:
+	$(QQ)"$(MAKE)" -C $(SRC_DIR) -f $(CURDIR)/nanopb.mk
diff --git a/.../external_modules/nanopb/Makefile.include → .../external_modules/nanopb/Makefile.include b/.../external_modules/nanopb/Makefile.include → .../external_modules/nanopb/Makefile.include
diff --git a/...es/riot/external_modules/nanopb/nanopb.mk → make/riot/external_modules/nanopb/nanopb.mk b/...es/riot/external_modules/nanopb/nanopb.mk → make/riot/external_modules/nanopb/nanopb.mk
diff --git a/make/riot/external_modules/proto/Makefile b/make/riot/external_modules/proto/Makefile
@@ -0,0 +1,6 @@
+include $(RIOTBASE)/Makefile.base
+
+SRC_DIR := $(realpath $(CURDIR)/../../../../external/proto)
+
+all:
+	$(QQ)"$(MAKE)" -C $(SRC_DIR) -f $(CURDIR)/proto.mk
diff --git a/...t/external_modules/proto/Makefile.include → ...t/external_modules/proto/Makefile.include b/...t/external_modules/proto/Makefile.include → ...t/external_modules/proto/Makefile.include
diff --git a/...ples/riot/external_modules/proto/proto.mk → make/riot/external_modules/proto/proto.mk b/...ples/riot/external_modules/proto/proto.mk → make/riot/external_modules/proto/proto.mk
diff --git a/make/riot/external_modules/reactor-uc/Makefile b/make/riot/external_modules/reactor-uc/Makefile
@@ -0,0 +1,6 @@
+include $(RIOTBASE)/Makefile.base
+
+SRC_DIR := $(realpath $(CURDIR)/../../../../src)
+
+all:
+	$(QQ)"$(MAKE)" -C $(SRC_DIR) -f $(CURDIR)/reactor-uc.mk
diff --git a/.../external_modules/reactor-uc/Makefile.dep → .../external_modules/reactor-uc/Makefile.dep b/.../external_modules/reactor-uc/Makefile.dep → .../external_modules/reactor-uc/Makefile.dep
diff --git a/...ernal_modules/reactor-uc/Makefile.include → ...ernal_modules/reactor-uc/Makefile.include b/...ernal_modules/reactor-uc/Makefile.include → ...ernal_modules/reactor-uc/Makefile.include
diff --git a/...external_modules/reactor-uc/reactor-uc.mk → ...external_modules/reactor-uc/reactor-uc.mk b/...external_modules/reactor-uc/reactor-uc.mk → ...external_modules/reactor-uc/reactor-uc.mk
diff --git a/...g_tcp_ip_channel_server_callback/Makefile → make/riot/riot.mk b/...g_tcp_ip_channel_server_callback/Makefile → make/riot/riot.mk
@@ -1,11 +1,7 @@
-# name of your application
-APPLICATION = lf-test
-
-# If no BOARD is found in the environment, use this default:
-BOARD ?= native
+RIOT_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # This has to be the absolute path to the RIOT base directory:
-RIOTBASE ?= $(CURDIR)/../../../../../RIOT
+RIOTBASE ?= $(RIOT_MK_DIR)/../../../RIOT
 
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
@@ -19,7 +15,7 @@ QUIET ?= 1
 FEATURES_OPTIONAL += periph_timer
 
 # External modules
-EXTERNAL_MODULE_DIRS += ../../external_modules
+EXTERNAL_MODULE_DIRS += $(RIOT_MK_DIR)/external_modules
 USEMODULE += reactor-uc
 
-include $(RIOTBASE)/Makefile.include
+include $(RIOTBASE)/Makefile.include
diff --git a/src/network_bundles.c b/src/network_bundles.c