From 269f2a83fff7618567ebc06b89f89eb6043c8fda Mon Sep 17 00:00:00 2001
From: root <root@ka-ata-killa.ourano.james.local>
Date: Mon, 8 Mar 2021 17:46:28 +0000
Subject: move display code of max7219, tidy makefile

---
 app/Makefile | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'app/Makefile')

diff --git a/app/Makefile b/app/Makefile
index 4b7d33a..9c7656e 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -26,7 +26,11 @@ LDSCRIPT = ${PROG}.ld
 V=1
 default: ${PROG}.elf
 
-CSRCS=led.c ticker.c ring.c usart.c stdio.c lwip_glue.c steth.c msf.c abs.c pll.c main.c time_fn.c ntp.c dcf77.c util.c stats.c gps.c hexdump.c bits.c  max7219.c  report.c sysclk.c cdcacm.c usb.c dfu.c adc.c dummy_kb.c ref.c ptp.c
+CSRCS=led.c ticker.c ring.c usart.c stdio.c lwip_glue.c steth.c msf.c abs.c \
+      pll.c main.c time_fn.c ntp.c dcf77.c util.c stats.c gps.c hexdump.c bits.c \
+      max7219.c  report.c sysclk.c cdcacm.c usb.c dfu.c adc.c dummy_kb.c ref.c \
+      ptp.c display.c
+
 HSRCS= events.h  gps.h  project.h  ring.h  steth.h  time_fn.h  ubx.h
 
 
@@ -38,15 +42,24 @@ LWIP_PATH=..
 
 VPATH=${LWIP_PATH}
 
-LWIP_API=#${LWIP}/src/api/err.c ${LWIP}/src/api/netdb.c ${LWIP}/src/api/api_msg.c ${LWIP}/src/api/tcpip.c ${LWIP}/src/api/sockets.c ${LWIP}/src/api/api_lib.c ${LWIP}/src/api/netbuf.c ${LWIP}/src/api/netifapi.c
-LWIP_CORE=${LWIP}/src/core/memp.c ${LWIP}/src/core/sys.c ${LWIP}/src/core/init.c ${LWIP}/src/core/pbuf.c ${LWIP}/src/core/dhcp.c ${LWIP}/src/core/ipv4/ip_addr.c ${LWIP}/src/core/ipv4/ip.c ${LWIP}/src/core/ipv4/ip_frag.c ${LWIP}/src/core/ipv4/inet.c ${LWIP}/src/core/ipv4/autoip.c ${LWIP}/src/core/ipv4/icmp.c ${LWIP}/src/core/ipv4/inet_chksum.c ${LWIP}/src/core/timers.c ${LWIP}/src/core/def.c  ${LWIP}/src/core/netif.c  ${LWIP}/src/netif/etharp.c ${LWIP}/src/core/raw.c ${LWIP}/src/core/mem.c  ${LWIP}/src/core/udp.c
-
-DEFINES=#
-#${LWIP}/src/core/tcp.c ${LWIP}/src/core/tcp_out.c #${LWIP}/src/core/tcp_in.c 
-
-# ${LWIP}/src/core/snmp/asn1_enc.c ${LWIP}/src/core/snmp/msg_in.c ${LWIP}/src/core/snmp/mib_structs.c ${LWIP}/src/core/snmp/mib2.c ${LWIP}/src/core/snmp/asn1_dec.c ${LWIP}/src/core/snmp/msg_out.c ${LWIP}/src/core/ipv6/icmp6.c ${LWIP}/src/core/ipv6/ip6.c ${LWIP}/src/core/ipv6/ip6_addr.c ${LWIP}/src/core/ipv6/inet6.c 
-# ${LWIP}/src/core/dns.c ${LWIP}/src/core/stats.c ${LWIP}/src/core/ipv4/igmp.c 
-
+LWIP_API=
+#	${LWIP}/src/api/err.c ${LWIP}/src/api/netdb.c ${LWIP}/src/api/api_msg.c \
+	${LWIP}/src/api/tcpip.c ${LWIP}/src/api/sockets.c ${LWIP}/src/api/api_lib.c \
+	${LWIP}/src/api/netbuf.c ${LWIP}/src/api/netifapi.c
+
+LWIP_CORE= \
+	${LWIP}/src/core/memp.c ${LWIP}/src/core/sys.c \
+	${LWIP}/src/core/init.c  ${LWIP}/src/core/pbuf.c \
+	${LWIP}/src/core/dhcp.c ${LWIP}/src/core/ipv4/ip_addr.c \
+	${LWIP}/src/core/ipv4/ip.c ${LWIP}/src/core/ipv4/ip_frag.c \
+	${LWIP}/src/core/ipv4/inet.c ${LWIP}/src/core/ipv4/autoip.c \
+	${LWIP}/src/core/ipv4/icmp.c ${LWIP}/src/core/ipv4/inet_chksum.c \
+	${LWIP}/src/core/timers.c ${LWIP}/src/core/def.c  \
+	${LWIP}/src/core/netif.c  ${LWIP}/src/netif/etharp.c \
+	${LWIP}/src/core/raw.c ${LWIP}/src/core/mem.c  \
+	${LWIP}/src/core/udp.c
+	
+DEFINES=
 
 LWIP_INC=${LWIP_PATH}/${LWIP}
 LWIP_LOCAL=${LWIP_PATH}/lwip/lwip-local
@@ -70,7 +83,10 @@ OBJS=${MYOBJS} ${LWIP_OBJS}
 include ../Makefile.include
 
 CFLAGS+=-Wno-redundant-decls -Wno-unused-parameter
-CPPFLAGS        += -I.. -I. -I../libopencm3-local  -Ilwip -I${LWIP_PATH}/${LWIP}/src/include -I${LWIP_PATH}/${LWIP}/src/include/ipv4 -I${LWIP_LOCAL}/port/stm32f4x7 
+CPPFLAGS+= -I.. -I. -I../libopencm3-local  -Ilwip \
+	-I${LWIP_PATH}/${LWIP}/src/include  \
+	-I${LWIP_PATH}/${LWIP}/src/include/ipv4  \
+	-I${LWIP_LOCAL}/port/stm32f4x7 
 
 
 LDLIBS+= -lm
-- 
cgit v1.2.3