From 3f4214227e993305bb320b299245f466b9b22233 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sat, 7 Mar 2015 17:19:31 +0100 Subject: Merge Stats and Config server, config is also JSON --- src/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index aa1f86a..f3bce5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,7 +79,7 @@ odr_dabmux_SOURCES =DabMux.cpp DabMux.h \ MuxElements.cpp MuxElements.h \ RemoteControl.cpp RemoteControl.h \ ParserCmdline.cpp ParserCmdline.h \ - ParserConfig.cpp ParserConfig.h \ + ConfigParser.cpp ConfigParser.h \ Eti.h Eti.cpp \ Log.h Log.cpp \ UdpSocket.h UdpSocket.cpp \ @@ -92,8 +92,7 @@ odr_dabmux_SOURCES =DabMux.cpp DabMux.h \ Interleaver.h Interleaver.cpp \ ReedSolomon.h ReedSolomon.cpp \ mpeg.h mpeg.c \ - StatsServer.h StatsServer.cpp \ - ConfigServer.h ConfigServer.cpp \ + ManagementServer.h ManagementServer.cpp \ TcpServer.h TcpServer.cpp \ TcpSocket.h TcpSocket.cpp \ zmq.hpp -- cgit v1.2.3