X-Git-Url: https://pd.if.org/git/?p=hexagon;a=blobdiff_plain;f=Makefile;h=9b2f4426ffc8f1cda05ba94a46b00e0bf69184af;hp=545d6f4d44d2f652fcae10d8d3769ad8d2add25f;hb=8ca2b8a06b00066a20f744a61c9bcdd65949a344;hpb=5c48a06bc8649958e69013c53e925b83398ebc74

diff --git a/Makefile b/Makefile
index 545d6f4..9b2f442 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@
 
 LDFLAGS= $(ARCH) -lm
 CFLAGS=	-Wall -Wno-parentheses $(ARCH) -I. -I..
-OBJS= hexmap.o astar.o
+OBJS= hexagon.o astar.o
 SRC=$(OBJS:.o=.c)
 TESTS= t/cantor.t t/distance.t t/adjacency.t t/range.t t/hexbin.t \
-       t/gridsize.t t/center.t
+       t/gridsize.t t/center.t t/astar.t
 
-all:	test libhexmap.a
+all:	test libhexagon.a docs
 
 clean:
-	rm -f $(OBJS) libhexmap.a $(TESTS)
+	rm -f $(OBJS) libhexagon.a $(TESTS)
 
 t/%.t:  t/%.o t/tap.o $(OBJS)
 	$(CC) -I.. -I. -o $@ $+ $(LDFLAGS)
@@ -20,13 +20,13 @@ t/%.t:  t/%.o t/tap.o $(OBJS)
 test:   $(TESTS)
 	@prove --exec '' 2>/dev/null
 
-hextest:	hextest.c libhexmap.a
-	$(CC) $(CFLAGS) -o $@ hextest.c -L. -lhexmap
-
-libhexmap.a:	$(OBJS)
+libhexagon.a:	$(OBJS)
 	ar r $@ $+
 	ranlib $@
 
+docs:
+	make -C doc
+
 .c.o:
 	$(CC) $(CFLAGS) -c -o $@ $<