X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdraw%2FMakefile;h=47336fbef3ca19168b45e90c650cb7570c21e895;hb=d804a00a7576d5e3c59c413762248787a1282c16;hp=c2e72bcda0b5522ddaae7d2ea638558e4e27da6a;hpb=2f68d82238ff869b76b554fd8de61e3b6d06e8f9;p=fw%2Faltos

diff --git a/src/draw/Makefile b/src/draw/Makefile
index c2e72bcd..47336fbe 100644
--- a/src/draw/Makefile
+++ b/src/draw/Makefile
@@ -32,6 +32,19 @@ BDFS=\
 	BenguiatGothicStd-Medium-48.bdf \
 	BenguiatGothicStd-Medium-64.bdf \
 	BenguiatGothicStd-Medium-72.bdf \
+	BitstreamVeraSansMono-Roman-10.bdf \
+	BitstreamVeraSansMono-Roman-12.bdf \
+	BitstreamVeraSansMono-Roman-14.bdf \
+	BitstreamVeraSansMono-Roman-16.bdf \
+	BitstreamVeraSansMono-Roman-18.bdf \
+	BitstreamVeraSansMono-Roman-24.bdf \
+	BitstreamVeraSansMono-Roman-26.bdf \
+	BitstreamVeraSansMono-Roman-28.bdf \
+	BitstreamVeraSansMono-Roman-32.bdf \
+	BitstreamVeraSansMono-Roman-36.bdf \
+	BitstreamVeraSansMono-Roman-48.bdf \
+	BitstreamVeraSansMono-Roman-64.bdf \
+	BitstreamVeraSansMono-Roman-72.bdf \
 	FrutigerLT-Roman-10.bdf \
 	FrutigerLT-Roman-12.bdf \
 	FrutigerLT-Roman-14.bdf \
@@ -44,7 +57,20 @@ BDFS=\
 	FrutigerLT-Roman-36.bdf \
 	FrutigerLT-Roman-48.bdf \
 	FrutigerLT-Roman-64.bdf \
-	FrutigerLT-Roman-72.bdf
+	FrutigerLT-Roman-72.bdf \
+	NotoMono-10.bdf \
+	NotoMono-12.bdf \
+	NotoMono-14.bdf \
+	NotoMono-16.bdf \
+	NotoMono-18.bdf \
+	NotoMono-24.bdf \
+	NotoMono-26.bdf \
+	NotoMono-28.bdf \
+	NotoMono-32.bdf \
+	NotoMono-36.bdf \
+	NotoMono-48.bdf \
+	NotoMono-64.bdf \
+	NotoMono-72.bdf
 
 FONT_SRCS=$(BDFS:.bdf=.c)
 
@@ -53,18 +79,17 @@ FONT_SRCS=$(BDFS:.bdf=.c)
 .bdf.c:
 	nickle font-convert -o $@ $<
 
-all: ao_font.h ao_logo.h draw-test
+all: ao_font.h ao_logo.h lco-test
 
 $(FONT_SRCS): font-convert
 
 ao_font.h: $(FONT_SRCS)
 	grep -h '^const struct ao_font' $(FONT_SRCS) | sed -e 's/^/extern /' -e 's/ =.*$$/;/' > $@
 
-ao_logo.h: make-logo Makefile
-	nickle make-logo ao_logo 48 0 10 > $@
+ao_logo.h: make-logo
+	nickle make-logo ao_logo > $@
 
-SRCS=\
-	draw-test.c \
+LIB_SRCS=\
 	ao_blt.c \
 	ao_copy.c \
 	ao_line.c \
@@ -75,11 +100,12 @@ SRCS=\
 	ao_logo.c \
 	$(FONT_SRCS)
 
-OBJS=$(SRCS:.c=.o)
+LCO_TEST_SRCS=$(LIB_SRCS) lco-test.c
+LCO_TEST_OBJS=$(LCO_TEST_SRCS:.c=.o)
 
-LIBS=-lXrender -lX11 -lm
+TEST_LIBS=-lXrender -lX11 -lm -Wl,--gc-sections
 
-CFLAGS=-O0 -g
+CFLAGS=-O0 -g $(WARN_FLAGS)
 
 HEADERS=\
 	ao_draw.h \
@@ -87,10 +113,10 @@ HEADERS=\
 	ao_font.h \
 	ao_logo.h
 
-draw-test: $(OBJS)
-	cc $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+lco-test: $(LCO_TEST_OBJS)
+	cc $(CFLAGS) -o $@ $(LCO_TEST_OBJS) $(TEST_LIBS)
 
-$(OBJS): $(HEADERS)
+$(LCO_TEST_OBJS): $(HEADERS)
 
 clean:
-	rm -f $(OBJS) ao_font.h ao_logo.h $(FONT_SRCS)
+	rm -f $(LCO_TEST_OBJS) ao_font.h ao_logo.h $(FONT_SRCS)