Separate out the acceptor stuff into its own file.

[cubemap] / Makefile

diff --git a/Makefile b/Makefile
index c80ab9d537d5bee77f999c646997b2d733eb553f..11adc8b1a80902a9b0c4c779b900d05d09447bc8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
 CC=gcc
 CXX=g++
+PROTOC=protoc
 CXXFLAGS=-Wall -O2 -g
-LDLIBS=-lcurl
+LDLIBS=-lpthread -lprotobuf
 
-OBJS=cubemap.o server.o mutexlock.o
+OBJS=main.o server.o serverpool.o mutexlock.o input.o parse.o markpool.o acceptor.o state.pb.o
 
 all: cubemap
 
-%.o: %.cpp
+%.pb.cc %.pb.h : %.proto
+       $(PROTOC) --cpp_out=. $<
+
+%.o: %.cpp state.pb.h
+       $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+%.pb.o: %.pb.cc
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 cubemap: $(OBJS)
        $(CXX) -o cubemap $(OBJS) $(LDLIBS)
@@ -16,5 +22,7 @@ DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-       $(RM) cubemap $(OBJS) $(DEPS)
+       $(RM) cubemap $(OBJS) $(DEPS) state.pb.h state.pb.cc
 
+.PHONY: clean
+.SUFFIXES: