Merge branch 'master' of /srv/git.sesse.net/www/cubemap

[cubemap] / Makefile

diff --git a/Makefile b/Makefile
index bc3511a7edc4fabee7a226f7cfa1fe49ce8447a3..20f4010fb95010d9db7a97e1d941f2e9329b310d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 CC=gcc
 CXX=g++
 PROTOC=protoc
-CXXFLAGS=-Wall -O2 -g
-LDLIBS=-lpthread -lprotobuf
+CXXFLAGS=-Wall -O2 -g -pthread
+LDLIBS=-lprotobuf -pthread
 
-OBJS=main.o server.o serverpool.o mutexlock.o input.o httpinput.o udpinput.o parse.o markpool.o acceptor.o stats.o thread.o state.pb.o
+OBJS=main.o client.o server.o stream.o serverpool.o mutexlock.o input.o httpinput.o udpinput.o parse.o config.o markpool.o acceptor.o stats.o accesslog.o thread.o util.o log.o state.pb.o
 
 all: cubemap