X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=vector%2FMakefile;h=ea8e8de71a6b93c5d3f34c91553d173110fee597;hb=da225d6f240bffd052502c0cf8804522514a7e61;hp=f8b05a7fd908a4292a30613b1aada6ae61b2a847;hpb=c2fcc2eaad945b2bee685ca8b71c565158da0e18;p=rrq%2Frrqmisc.git

diff --git a/vector/Makefile b/vector/Makefile
index f8b05a7..ea8e8de 100644
--- a/vector/Makefile
+++ b/vector/Makefile
@@ -1,26 +1,7 @@
-LIBRARY = libvector.a
-LIBOBJS = vector.o hashvector.o
-
-# This is overridable on command line
-VECTOR_LEVEL_BITS = 4
+LIBRARY = librrqvector.a
+LIBOBJS = Vector.o HashVector.o
 
 default: $(LIBRARY)
-
-all: default
-
-CFLAGS = -Wall -g -fmax-errors=1 -DVECTOR_LEVEL_BITS=$(VECTOR_LEVEL_BITS)
-
-define STDCC
-.INTERMEDIATE: $1.o
-CLEANRM += $1.o
-$1.o: $1.c | $1.h
-endef
-
-$(foreach OBJ,$(LIBOBJS:.o=),$(eval $(call STDCC,$(OBJ))))
-
 CLEANRM += $(LIBRARY)
-$(LIBRARY): $(LIBOBJS)
-	$(AR) r $@ $^
 
-clean:
-	rm -f $(CLEANRM)
+include ../common.mk