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

diff --git a/vector/Makefile b/vector/Makefile
index a3feec4..ea8e8de 100644
--- a/vector/Makefile
+++ b/vector/Makefile
@@ -1,34 +1,7 @@
-LIBRARY = libvector.a
+LIBRARY = librrqvector.a
 LIBOBJS = Vector.o HashVector.o
-LIBOBJS += Tuple.o TupleSchema.o integeritem.o stringitem.o Binding.o
-LIBOBJS += BindingTable.o Relation.o Query.o
-LIBOBJS += AssignQuery.o RelationQuery.o
-LIBOBJS += NotQuery.o AndQuery.o OrQuery.o
-#LIBOBJS += View.o
 
 default: $(LIBRARY)
-
-all: default
-
-CFLAGS = -Wall -g -fmax-errors=1 -I.
-LDLIBS = -lm
-
-%.h:
-	echo "#ifndef ${@:.h=_H}" > $@
-	echo "#define ${@:.h=_H}" >> $@
-	echo "#endif" >> $@
-
-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