altos: Build in 'draw' directory first

[fw/altos] / src / draw / Makefile

diff --git a/src/draw/Makefile b/src/draw/Makefile
index 47336fbef3ca19168b45e90c650cb7570c21e895..6b986b4223e0631eb334d2651db3427da853a198 100644 (file)
--- a/src/draw/Makefile
+++ b/src/draw/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/Makefile.defs
 
 vpath %.bdf fonts
 
-BITMAP_SIZES = 10, 12, 14, 16, 18, 24, 26, 28, 32, 36, 48, 64, 72
+BITMAP_SIZES = 10, 12, 14, 16, 18, 24, 26, 28, 32, 36, 48, 58, 60, 62, 64, 72
 
 BDFS=\
        BenguiatGothicStd-Bold-10.bdf \
@@ -45,6 +45,22 @@ BDFS=\
        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 \
@@ -79,7 +95,9 @@ FONT_SRCS=$(BDFS:.bdf=.c)
 .bdf.c:
        nickle font-convert -o $@ $<
 
-all: ao_font.h ao_logo.h lco-test
+all: ao_font.h ao_logo.h
+
+test: lco-test line-test
 
 $(FONT_SRCS): font-convert
 
@@ -91,6 +109,7 @@ ao_logo.h: make-logo
 
 LIB_SRCS=\
        ao_blt.c \
+       ao_box.c \
        ao_copy.c \
        ao_line.c \
        ao_pattern.c \
@@ -103,9 +122,12 @@ LIB_SRCS=\
 LCO_TEST_SRCS=$(LIB_SRCS) lco-test.c
 LCO_TEST_OBJS=$(LCO_TEST_SRCS:.c=.o)
 
-TEST_LIBS=-lXrender -lX11 -lm -Wl,--gc-sections
+LINE_TEST_SRCS=$(LIB_SRCS) line-test.c
+LINE_TEST_OBJS=$(LINE_TEST_SRCS:.c=.o)
+
+TEST_LIBS=-lXrender -lXext -lX11 -lm -Wl,--gc-sections
 
-CFLAGS=-O0 -g $(WARN_FLAGS)
+CFLAGS=-O3 -g $(WARN_FLAGS) -DVALIDATE -I.
 
 HEADERS=\
        ao_draw.h \
@@ -116,7 +138,16 @@ HEADERS=\
 lco-test: $(LCO_TEST_OBJS)
        cc $(CFLAGS) -o $@ $(LCO_TEST_OBJS) $(TEST_LIBS)
 
+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 $(LCO_TEST_OBJS) ao_font.h ao_logo.h $(FONT_SRCS)