Compile and link with -pthread, not -lpthread.

[cubemap] / Makefile

diff --git a/Makefile b/Makefile
index a9333f037bec926c4f1d3779acc19f37ab325d29..36fb4f88e1bf6ae9608c64afcbe880fc03837b82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 CC=gcc
 CXX=g++
 PROTOC=protoc
-CXXFLAGS=-Wall -O2 -g
-LDLIBS=-lpthread -lprotobuf
+CXXFLAGS=-Wall -O2 -g -pthread
+LDLIBS=-lprotobuf
+LDFLAGS=-pthread
 
-OBJS=main.o server.o serverpool.o mutexlock.o input.o parse.o markpool.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