lwip: fix library make rules

- Remove unneeded include in Makefile.app - Add necessary Makefile.setup for submodule checkout
tock · Mar 5, 2025 · deb8651 · deb8651
1 parent 55d5027
commit deb8651
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lwip/Makefile b/lwip/Makefile
@@ -24,7 +24,7 @@ $(LIBNAME)_SRCS := $(LWIPNOAPPSFILES) $(LWIPAPPFILES)
 override CPPFLAGS += -I$(lwip_DIR)/include -I$(lwip_DIR)/include/lwip
 
 # Avoid failing in CI due to warnings in the library.
- override CPPFLAGS_$(LIBNAME) += -Wno-error
+override CPPFLAGS_$(LIBNAME) += -Wno-error
 
 # Include the rules to build the library.
 include $(TOCK_USERLAND_BASE_DIR)/TockLibrary.mk
diff --git a/lwip/Makefile.app b/lwip/Makefile.app
@@ -1,3 +1 @@
-include $(TOCK_USERLAND_BASE_DIR)/lwip/Makefile
-
-override CPPFLAGS += -I$(lwip_DIR)/lwip/src/include
+override CPPFLAGS += -I$(lwip_DIR)/lwip/src/include
diff --git a/lwip/Makefile.setup b/lwip/Makefile.setup
@@ -0,0 +1,8 @@
+TOCK_USERLAND_BASE_DIR ?= ..
+
+$(TOCK_USERLAND_BASE_DIR)/lwip/lwip/README:
+	git submodule init $(TOCK_USERLAND_BASE_DIR)/lwip/lwip
+	git submodule update $(TOCK_USERLAND_BASE_DIR)/lwip/lwip
+
+# Any sentinel file which lets us know if submodule is checked out
+all: | $(TOCK_USERLAND_BASE_DIR)/lwip/lwip/README