renamed library to hexagon

[hexagon] / Makefile

diff --git a/Makefile b/Makefile
index 545d6f4d44d2f652fcae10d8d3769ad8d2add25f..9b2f4426ffc8f1cda05ba94a46b00e0bf69184af 100644 (file)
--- 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 $@ $<