Refactor ui code

Makefile

@@ -4,22 +4,29 @@
 CC=clang
 CFLAGS=-g -std=c11 -Wall ${SQLITE3_CFLAGS}
 LD=clang
-LDFLAGS=-lgpio -lfigpar -lpthread ${SQLITE3_LDFLAGS}
-SRCS=src/main.c src/util.c src/lcd.c src/ths.c src/button.c src/screen.c
+LDFLAGS=-lgpio -lfigpar -lgeom -lpthread ${SQLITE3_LDFLAGS}
+SRCS=src/main.c src/util.c src/lcd.c src/ths.c src/button.c src/ui/screen.c\
+     src/ui/datesel.c src/ui/statsby.c
 PROG=rpi4b-temp-humidity
 
 OBJS=${SRCS:C/^src/bin/:C/.c$/.o/}
 bin/${PROG}: ${OBJS}
 	${LD} ${LDFLAGS} -o ${@} ${OBJS}
 
-bin/main.o bin/util.o bin/lcd.o bin/ths.o bin/button.o bin/screen.o: src/util.h
-bin/main.o bin/lcd.o bin/screen.o: src/lcd.h
-bin/main.o bin/ths.o bin/screen.o: src/ths.h
-bin/main.o bin/button.o bin/screen.o: src/button.h
-bin/main.o bin/screen.o: src/screen.h
+bin/main.o bin/util.o bin/lcd.o bin/ths.o bin/button.o: src/util.h
+bin/ui/screen.o bin/ui/statsby.o bin/ui/datesel.o: src/util.h
+
+bin/main.o bin/lcd.o bin/screen.o bin/ui/datesel.o: src/lcd.h
+bin/ui/statsby.o: src/lcd.h
+
+bin/main.o bin/ths.o bin/ui/screen.o bin/ui/statsby.o: src/ths.h
+bin/main.o bin/button.o bin/ui/screen.o: src/button.h
+bin/main.o bin/ui/screen.o bin/ui/statsby.o bin/ui/datesel.o: src/ui/screen.h
+bin/main.o bin/ui/datesel.o bin/ui/statsby.o: src/ui/datesel.h
+bin/main.o bin/ui/statsby.o: src/ui/statsby.h
 
 ${OBJS}: ${.TARGET:C/^bin/src/:C/.o$/.c/}
-	@mkdir -p bin/
+	@mkdir -p ${.TARGET:H}
 	${CC} ${CFLAGS} -c\
 -DDEFAULT_CONFIG_PATH="\"${DEFAULT_CONFIG_PATH}\""\
 -DDEFAULT_GPIO_DEVICE="\"${DEFAULT_GPIO_DEVICE}\""\