From 2320ce5e999db11ff5b22ff8d50611b54fcf7534 Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Sat, 7 Dec 2019 13:11:46 -0700 Subject: [PATCH] some changes to Makefiles and added top-level Makefile --- Makefile | 7 +++++++ buildutils/Makefile | 2 +- src/Makefile | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1273313 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +all: + make -C buildutils all + make -C src all + +clean: + make -C buildutils clean + make -C src clean diff --git a/buildutils/Makefile b/buildutils/Makefile index fb1c6ca..296377c 100644 --- a/buildutils/Makefile +++ b/buildutils/Makefile @@ -1,4 +1,4 @@ -ALL: mksplash +all: mksplash mksplash: mksplash.c gcc -o mksplash -O -Wall -I/usr/include/libpng mksplash.c -lpng16 -lz diff --git a/src/Makefile b/src/Makefile index b9fd929..902fc62 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,6 +2,8 @@ OBJS=main.o sysinput.o fbinit.o fbprimitive.o log.o gpio.o msg_queue.o time_func LIBS=-lbcm2835 -lpthread CFLAGS=-g -O -DDEBUG_ASSERT +all: upiwin + upiwin: $(OBJS) gcc -o upiwin $(OBJS) $(LIBS)