X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=Makefile.in;h=b4d84569948d3ae34e4215496cb923a9d904c2e2;hp=62cb4a47ac5a69896f5a25e35b3d0557ecb07192;hb=4c536785e44615d91b240de1618fd8f6e9bc4c3f;hpb=b1b81d8f5492e48a60f0ed2930a098747928e5c4

diff --git a/Makefile.in b/Makefile.in
index 62cb4a4..b4d8456 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,11 +3,12 @@ CXX=@CXX@
 INSTALL=install
 PROTOC=protoc
 CPPFLAGS=@CPPFLAGS@
-CXXFLAGS=-Wall @CXXFLAGS@ @protobuf_CFLAGS@ @libsystemd_CFLAGS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@ @protobuf_LIBS@ @libsystemd_LIBS@
+CPPFLAGS += -Itlse -DWITH_KTLS -DNO_TLS_LEGACY_SUPPORT -DNO_SSL_COMPATIBLE_INTERFACE -DLTM_DESC -DTLS_REEXPORTABLE -DNO_TLS_WITH_CHACHA20_POLY1305
+CXXFLAGS=-Wall @CXXFLAGS@ @protobuf_CFLAGS@ @libsystemd_CFLAGS@ @libtomcrypt_CFLAGS@ -pthread
+LDFLAGS=@LDFLAGS@ -pthread
+LIBS=@LIBS@ @protobuf_LIBS@ @libsystemd_LIBS@ @libtomcrypt_LIBS@
 
-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 acceptor.o stats.o accesslog.o thread.o util.o log.o metacube2.o sa_compare.o timespec.o state.pb.o
+OBJS=main.o client.o server.o stream.o udpstream.o serverpool.o input.o input_stats.o httpinput.o udpinput.o parse.o config.o acceptor.o stats.o accesslog.o thread.o util.o log.o metacube2.o sa_compare.o timespec.o state.pb.o tlse/tlse.o
 
 all: cubemap
 
@@ -16,6 +17,8 @@ all: cubemap
 
 %.o: %.cpp state.pb.h
 	$(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+%.o: %.c
+	$(CC) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 %.pb.o: %.pb.cc
 	$(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 cubemap: $(OBJS)
@@ -38,14 +41,14 @@ install:
 		$(DESTDIR)$(LOCALSTATEDIR)/lib/cubemap \
 		$(DESTDIR)$(LOCALSTATEDIR)/log/cubemap \
 		$(DESTDIR)$(PREFIX)/share/munin/plugins \
-		$(DESTDIR)$(PREFIX)/lib/systemd/system
+		$(DESTDIR)/lib/systemd/system
 	$(INSTALL) -m 755 -o root -g root cubemap $(DESTDIR)$(PREFIX)/bin/cubemap
 	$(INSTALL) -m 755 -o root -g root munin/cubemap munin/cubemap_input $(DESTDIR)$(PREFIX)/share/munin/plugins/
 	gzip -c cubemap.1 > $(DESTDIR)$(PREFIX)/share/man/man1/cubemap.1.gz
 	sed \
 		-e "s,@prefix[@],$(PREFIX),g" \
 		-e "s,@sysconfdir[@],$(SYSCONFDIR),g" \
-		cubemap.service.in > $(DESTDIR)$(PREFIX)/lib/systemd/system/cubemap.service
+		cubemap.service.in > $(DESTDIR)/lib/systemd/system/cubemap.service
 	# Make sure we don't overwrite an existing configuration.
 	test ! -f $(DESTDIR)$(SYSCONFDIR)/cubemap.config
 	sed \