X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=1cc866d53519cb1b215f91f0be5a16d8b7207548;hb=875b086391c824db13ebfb86303105ba18c462a9;hp=9d133eca5c6f2a0817d8a1e1d62effa8b4ac1712;hpb=8027830475c781c5538e5466f30434c08a840ccd;p=remoteglot-book

diff --git a/Makefile b/Makefile
index 9d133ec..1cc866d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
 CXXFLAGS=-std=gnu++11 -O2 -g -Wall
 LDLIBS=-lmtbl -lfarmhash -lprotobuf
 PROTOC=protoc
+CC=g++
 
 all: binloader binlookup binmerger
 
-binloader: binloader.o hash.o arena.o count.pb.o
-binmerger: binmerger.o count.pb.o
-binlookup: binlookup.o hash.o count.pb.o
+binloader: binloader.o hash.o count.pb.o
+binmerger: binmerger.o merge_count.o count.pb.o
+binlookup: binlookup.o hash.o merge_count.o count.pb.o
 
-binloader.o: binloader.cpp arena.cpp count.pb.h
-binmerger.o: binmerger.cpp count.pb.h
-binlookup.o: binlookup.cpp count.pb.h
+binloader.o: binloader.cpp count.pb.h
+binmerger.o: binmerger.cpp merge_count.h count.pb.h
+binlookup.o: binlookup.cpp merge_count.h count.pb.h
+merge_count.o: merge_count.cpp merge_count.h count.pb.h
 
 %.pb.cc %.pb.h : %.proto
 	$(PROTOC) --cpp_out=. $<
 
 .PHONY: clean
 clean:
-	$(RM) binloader binlookup binmerger binloader.o binmerger.o binlookup.o hash.o arena.o count.pb.o count.pb.h count.pb.cc
+	$(RM) binloader binlookup binmerger binloader.o binmerger.o binlookup.o hash.o count.pb.o count.pb.h count.pb.cc