Tweak the MutexLock implementation slightly, so as to confuse Coverity less.

[cubemap] / Makefile

diff --git a/Makefile b/Makefile
index f99e22665b3393f153016c2d9a4e3dd739b526aa..7269a4f820310e1fc008887eb10514787b62ec7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 CC=gcc
 CXX=g++
+INSTALL=install
 PROTOC=protoc
-CXXFLAGS=-Wall -O2 -g
-LDLIBS=-lpthread -lprotobuf
+CXXFLAGS=-Wall -O2 -g -pthread
+LDLIBS=-lprotobuf -pthread -lrt
 
-OBJS=main.o server.o serverpool.o mutexlock.o input.o httpinput.o udpinput.o parse.o config.o markpool.o acceptor.o stats.o thread.o state.pb.o
+OBJS=main.o client.o server.o stream.o udpstream.o serverpool.o mutexlock.o input.o input_stats.o httpinput.o udpinput.o parse.o config.o markpool.o acceptor.o stats.o accesslog.o thread.o util.o log.o metacube2.o state.pb.o
 
 all: cubemap
 
@@ -16,7 +17,7 @@ all: cubemap
 %.pb.o: %.pb.cc
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 cubemap: $(OBJS)
-       $(CXX) -o cubemap $(OBJS) $(LDLIBS)
+       $(CXX) -o cubemap $(OBJS) $(LDLIBS) $(LDFLAGS)
 
 DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
@@ -24,5 +25,19 @@ DEPS=$(OBJS:.o=.d)
 clean:
        $(RM) cubemap $(OBJS) $(DEPS) state.pb.h state.pb.cc
 
-.PHONY: clean
+PREFIX=/usr/local
+install:
+       $(INSTALL) -m 755 -o root -g root -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)/etc $(DESTDIR)/var/lib/cubemap $(DESTDIR)/var/log/cubemap
+       $(INSTALL) -m 755 -o root -g root cubemap $(DESTDIR)$(PREFIX)/bin/cubemap
+       sed \
+               -e 's,cubemap\.stats,/var/lib/cubemap/\0,g' \
+               -e 's,cubemap-input\.stats,/var/lib/cubemap/\0,g' \
+               -e 's,access\.log,/var/log/cubemap/\0,g' \
+               -e 's,cubemap\.log,/var/log/cubemap/\0,g' \
+               -e 's,^stream,#\0,g' \
+               -e 's,^udpstream,#\0,g' \
+               cubemap.config.sample > $(DESTDIR)/etc/cubemap.config
+       gzip -c cubemap.1 > $(DESTDIR)$(PREFIX)/share/man/man1/cubemap.1.gz
+
+.PHONY: clean install
 .SUFFIXES: