X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdraw%2FMakefile;h=6b986b4223e0631eb334d2651db3427da853a198;hb=HEAD;hp=46771f1fde7c8b5576c2192631b44f1b8e550770;hpb=2e784b9e726a59f2aed71c20d96ebc94aa2d19fb;p=fw%2Faltos

diff --git a/src/draw/Makefile b/src/draw/Makefile
index 46771f1f..746178a0 100644
--- a/src/draw/Makefile
+++ b/src/draw/Makefile
@@ -1,33 +1,115 @@
+TOPDIR=..
+include $(TOPDIR)/Makefile.defs
+
+vpath %.bdf fonts
+
+BITMAP_SIZES = 10, 12, 14, 16, 18, 24, 26, 28, 32, 36, 48, 58, 60, 62, 64, 72
+
 BDFS=\
+	BenguiatGothicStd-Bold-10.bdf \
+	BenguiatGothicStd-Bold-12.bdf \
+	BenguiatGothicStd-Bold-14.bdf \
+	BenguiatGothicStd-Bold-16.bdf \
+	BenguiatGothicStd-Bold-18.bdf \
+	BenguiatGothicStd-Bold-24.bdf \
+	BenguiatGothicStd-Bold-26.bdf \
+	BenguiatGothicStd-Bold-28.bdf \
+	BenguiatGothicStd-Bold-32.bdf \
+	BenguiatGothicStd-Bold-36.bdf \
+	BenguiatGothicStd-Bold-48.bdf \
+	BenguiatGothicStd-Bold-64.bdf \
+	BenguiatGothicStd-Bold-72.bdf \
+	BenguiatGothicStd-Medium-10.bdf \
+	BenguiatGothicStd-Medium-12.bdf \
+	BenguiatGothicStd-Medium-14.bdf \
+	BenguiatGothicStd-Medium-16.bdf \
+	BenguiatGothicStd-Medium-18.bdf \
+	BenguiatGothicStd-Medium-24.bdf \
+	BenguiatGothicStd-Medium-26.bdf \
+	BenguiatGothicStd-Medium-28.bdf \
+	BenguiatGothicStd-Medium-32.bdf \
+	BenguiatGothicStd-Medium-36.bdf \
+	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 \
+	BitstreamVeraSans-Roman-10.bdf \
+	BitstreamVeraSans-Roman-12.bdf \
+	BitstreamVeraSans-Roman-14.bdf \
+	BitstreamVeraSans-Roman-16.bdf \
+	BitstreamVeraSans-Roman-18.bdf \
+	BitstreamVeraSans-Roman-24.bdf \
+	BitstreamVeraSans-Roman-26.bdf \
+	BitstreamVeraSans-Roman-28.bdf \
+	BitstreamVeraSans-Roman-32.bdf \
+	BitstreamVeraSans-Roman-36.bdf \
+	BitstreamVeraSans-Roman-48.bdf \
+	BitstreamVeraSans-Roman-58.bdf \
+	BitstreamVeraSans-Roman-60.bdf \
+	BitstreamVeraSans-Roman-62.bdf \
+	BitstreamVeraSans-Roman-64.bdf \
+	BitstreamVeraSans-Roman-72.bdf \
 	FrutigerLT-Roman-10.bdf \
 	FrutigerLT-Roman-12.bdf \
 	FrutigerLT-Roman-14.bdf \
+	FrutigerLT-Roman-16.bdf \
 	FrutigerLT-Roman-18.bdf \
 	FrutigerLT-Roman-24.bdf \
+	FrutigerLT-Roman-26.bdf \
+	FrutigerLT-Roman-28.bdf \
+	FrutigerLT-Roman-32.bdf \
 	FrutigerLT-Roman-36.bdf \
 	FrutigerLT-Roman-48.bdf \
 	FrutigerLT-Roman-64.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)
 
 .SUFFIXES: .bdf .c
 
 .bdf.c:
-	nickle font-convert $*.bdf > $@
+	nickle font-convert -o $@ $<
 
-all: ao_font.h ao_logo.h draw-test
+all: ao_font.h ao_logo.h
+
+test: lco-test line-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_box.c \
 	ao_copy.c \
 	ao_line.c \
 	ao_pattern.c \
@@ -37,11 +119,15 @@ 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)
+
+LINE_TEST_SRCS=$(LIB_SRCS) line-test.c
+LINE_TEST_OBJS=$(LINE_TEST_SRCS:.c=.o)
 
-LIBS=-lXrender -lX11 -lm
+TEST_LIBS=-lXrender -lXext -lX11 -lm -Wl,--gc-sections
 
-CFLAGS=-O0 -g
+CFLAGS=-O3 -g $(WARN_FLAGS) -DVALIDATE -I.
 
 HEADERS=\
 	ao_draw.h \
@@ -49,10 +135,21 @@ 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.o: test-frame.c frame.c
+
+$(LCO_TEST_OBJS): $(HEADERS)
+
+line-test: $(LINE_TEST_OBJS)
+	cc $(CFLAGS) -o $@ $(LINE_TEST_OBJS) $(TEST_LIBS)
+
+line-test.o: test-frame.c frame.c
+
+$(LINE_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)
+
+install: