diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-07 17:19:31 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-07 17:27:12 +0100 |
| commit | 3f4214227e993305bb320b299245f466b9b22233 (patch) | |
| tree | 0863975f29692d0939e3acc53b76a00e97f2aadc /src/Makefile.am | |
| parent | 0414d5788090bb6df728d370079e44e95b4ffd20 (diff) | |
| download | dabmux-3f4214227e993305bb320b299245f466b9b22233.tar.gz dabmux-3f4214227e993305bb320b299245f466b9b22233.tar.bz2 dabmux-3f4214227e993305bb320b299245f466b9b22233.zip | |
Merge Stats and Config server, config is also JSON
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
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 |