1 files changed, 8 insertions, 44 deletions
diff --git a/os/various/lwip_bindings/lwip.mk b/os/various/lwip_bindings/lwip.mk
index 2ab332a09..7674931f3 100644
--- a/os/various/lwip_bindings/lwip.mk
+++ b/os/various/lwip_bindings/lwip.mk
@@ -1,54 +1,18 @@
 # List of the required lwIP files.
-LWIP = 	$(CHIBIOS)/ext/lwip
+LWIPDIR = 	$(CHIBIOS)/ext/lwip/src
+
+# The various blocks of files are outlined in Filelists.mk.
+include $(LWIPDIR)/Filelists.mk
 
 LWBINDSRC = \
         $(CHIBIOS)/os/various/lwip_bindings/lwipthread.c \
         $(CHIBIOS)/os/various/lwip_bindings/arch/sys_arch.c
 
-LWNETIFSRC = \
-        $(LWIP)/src/netif/etharp.c
-
-LWCORESRC = \
-        $(LWIP)/src/core/dhcp.c \
-        $(LWIP)/src/core/dns.c \
-        $(LWIP)/src/core/init.c \
-        $(LWIP)/src/core/mem.c \
-        $(LWIP)/src/core/memp.c \
-        $(LWIP)/src/core/netif.c \
-        $(LWIP)/src/core/pbuf.c \
-        $(LWIP)/src/core/raw.c \
-        $(LWIP)/src/core/stats.c \
-        $(LWIP)/src/core/sys.c \
-        $(LWIP)/src/core/tcp.c \
-        $(LWIP)/src/core/tcp_in.c \
-        $(LWIP)/src/core/tcp_out.c \
-        $(LWIP)/src/core/udp.c
-
-LWIPV4SRC = \
-        $(LWIP)/src/core/ipv4/autoip.c \
-        $(LWIP)/src/core/ipv4/icmp.c \
-        $(LWIP)/src/core/ipv4/igmp.c \
-        $(LWIP)/src/core/ipv4/inet.c \
-        $(LWIP)/src/core/ipv4/inet_chksum.c \
-        $(LWIP)/src/core/ipv4/ip.c \
-        $(LWIP)/src/core/ipv4/ip_addr.c \
-        $(LWIP)/src/core/ipv4/ip_frag.c \
-        $(LWIP)/src/core/def.c \
-        $(LWIP)/src/core/timers.c
-
-LWAPISRC = \
-        $(LWIP)/src/api/api_lib.c \
-        $(LWIP)/src/api/api_msg.c \
-        $(LWIP)/src/api/err.c \
-        $(LWIP)/src/api/netbuf.c \
-        $(LWIP)/src/api/netdb.c \
-        $(LWIP)/src/api/netifapi.c \
-        $(LWIP)/src/api/sockets.c \
-        $(LWIP)/src/api/tcpip.c
 
-LWSRC = $(LWBINDSRC) $(LWNETIFSRC) $(LWCORESRC) $(LWIPV4SRC) $(LWAPISRC)
+# Add blocks of files from Filelists.mk as required for enabled options
+LWSRC = $(COREFILES) $(CORE4FILES) $(APIFILES) $(LWBINDSRC) $(NETIFFILES) $(HTTPDFILES)
 
 LWINC = \
         $(CHIBIOS)/os/various/lwip_bindings \
-        $(LWIP)/src/include \
-        $(LWIP)/src/include/ipv4
+        $(LWIPDIR)/include \
+        $(LWIPDIR)/include/lwip/apps