--- a/Makefile	Thu Oct 28 10:15:18 2021 +0200
+++ b/Makefile	Fri Nov 05 01:14:56 2021 +0100
@@ -12,9 +12,9 @@
 
 export BUILDBASE
 
-.PHONY: all gemma client clean
+.PHONY: all gemma gmaggregate client clean
 
-all: gemma client
+all: gemma gmaggregate client
 
 $(ENVWARPPER):
 	@echo "Preparing go build environment:"
@@ -30,21 +30,28 @@
 gemma: $(ENVWARPPER)
 	"$(ENVWARPPER)" go build -o ./cmd/gemma/gemma ./cmd/gemma
 
+gmaggregate: $(ENVWARPPER)
+	cd ./contrib/gmaggregate; "$(ENVWARPPER)" go build
+
 client:
 	$(MAKE) -f Makefile.build -C client
 
 install: gemma
 	cp cmd/gemma/gemma $(BINDIR)
+	cp contrib/gmaggregate/gmaggregate $(BINDIR)
 
 tar: all
 	v="gemma-$$(hg id -i)" ;\
         tar --transform "s@^@$${v}/@" \
 	    -cJf "../$${v}.tar.xz" \
-	    cmd/gemma/gemma schema style-templates report-templates \
+	    cmd/gemma/gemma \
+	    contrib/gmaggregate/gmaggregate \
+	    schema style-templates report-templates \
 	    web misc example_conf.toml
 
 clean:
 	$(MAKE) -f Makefile.build -C client $@
-	rm -f "$(gemma-bin)"
+	rm -f contrib/gmaggregate/gmaggregate
+	rm -f cmd/gemma/gemma
 	chmod -R u+w "$(BUILDBASE)" # This is neccessary for deletion to work...
 	rm -rf "$(BUILDBASE)"