diff --git a/lib/Makefile b/lib/Makefile index bd45e3d..959883f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,5 +1,5 @@ TOPSRC = $(shell cd ..; pwd) -SUBDIR = startup libc libm libcurses libtermlib libwiznet libreadline +SUBDIR = startup libc libm libcurses libtermlib libwiznet libreadline libgpanel PROG = ar as aout ld nm ranlib size strip CFLAGS += -std=gnu89 -fno-builtin -g -Werror -Wall -DCROSS -I. \ diff --git a/lib/libgpanel/Makefile b/lib/libgpanel/Makefile new file mode 100644 index 0000000..11c8526 --- /dev/null +++ b/lib/libgpanel/Makefile @@ -0,0 +1,18 @@ +TOPSRC = $(shell cd ../..; pwd) +include $(TOPSRC)/target.mk + +vpath %.c $(TOPSRC)/src/libgpanel + +CFLAGS += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror + +OBJS = open.o clear.o pixel.o line.o rect.o fill.o circle.o \ + image.o char.o text.o text_width.o + +all: ../libgpanel.a + +../libgpanel.a: ../ar ../ranlib $(OBJS) + ../ar rc $@ $(OBJS) + ../ranlib $@ + +clean: + rm -f *~ *.o a.out *.a diff --git a/rootfs.manifest b/rootfs.manifest index daa74d3..f3881fd 100644 --- a/rootfs.manifest +++ b/rootfs.manifest @@ -862,6 +862,7 @@ file /include/sys/file.h file /include/sys/fs.h file /include/sys/glcd.h file /include/sys/glob.h +file /include/sys/gpanel.h file /include/sys/gpio.h file /include/sys/inode.h file /include/sys/ioctl.h @@ -928,6 +929,7 @@ file /lib/crt0.o file /lib/libc.a file /lib/libm.a file /lib/libcurses.a +file /lib/libgpanel.a file /lib/libreadline.a file /lib/libtermlib.a file /lib/libwiznet.a diff --git a/src/Makefile b/src/Makefile index 9283177..3fb4047 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,7 +9,7 @@ include $(TOPSRC)/target.mk # Programs that live in subdirectories, and have makefiles of their own. # SUBDIR = startup-$(MACHINE) libc libm libutil libtermlib libcurses \ - libvmf libwiznet libreadline share cmd games man + libvmf libwiznet libreadline libgpanel share cmd games man all: $(SUBDIR)