Merge raspine's ZeroMQ RC and UHD staticdelay

Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
        doc/example.ini
        src/DabMod.cpp

1 files changed, 70 insertions, 54 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e851c4..922ce52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,89 +22,105 @@ else
 GITVERSION_FLAGS =
 endif
 
-if HAVE_INPUT_ZEROMQ_TEST
-ZMQ_LIBS    =-lzmq
+if HAVE_SSE
+SIMD_CFLAGS = -msse -msse2
 else
-ZMQ_LIBS    =
+SIMD_CFLAGS =
 endif
 
-if HAVE_OUTPUT_UHD_TEST
-UHD_SOURCES    =OutputUHD.cpp OutputUHD.h
-else
-UHD_SOURCES    =
-endif
+bin_PROGRAMS = odr-dabmod
 
+if USE_KISS_FFT
 FFT_DIR=$(top_builddir)/lib/kiss_fft129
 FFT_INC=-I$(FFT_DIR) -I$(FFT_DIR)/tools
-FFT_SRC=$(FFT_DIR)/kiss_fft.c $(FFT_DIR)/kiss_fft.h $(FFT_DIR)/tools/kiss_fftr.c $(FFT_DIR)/tools/kiss_fftr.h kiss_fftsimd.c kiss_fftsimd.h
+FFT_SRC=$(FFT_DIR)/kiss_fft.c \
+		$(FFT_DIR)/kiss_fft.h \
+		$(FFT_DIR)/tools/kiss_fftr.c \
+		$(FFT_DIR)/tools/kiss_fftr.h \
+		kiss_fftsimd.c \
+		kiss_fftsimd.h
 FFT_FLG=-ffast-math
 
 .PHONY: kiss_fft129 reed-solomon-4.0
 
-bin_PROGRAMS =  odr-dabmod
+DabModulator.cpp: $(FFT_DIR)
 
-DabModulator.cpp:   $(FFT_DIR)
+BUILT_SOURCES: $(FFT_DIR)
 
-BUILT_SOURCES:  $(FFT_DIR)
+FFT_LDADD=
 
 $(FFT_DIR):
 	if [ ! -e $(FFT_DIR) ]; then \
 		tar xzf $(top_srcdir)/lib/kiss_fft129.tar.gz -C $(top_builddir)/lib; \
 	fi
 
-odr_dabmod_CPPFLAGS = -Wall $(FFT_INC) $(FFT_FLG) -msse -msse2 $(GITVERSION_FLAGS)
-odr_dabmod_LDADD    = $(ZMQ_LIBS)
+else
+FFT_LDADD=
+FFT_DIR=
+FFT_INC=
+FFT_SRC=
+FFT_FLG=
+endif
+
+odr_dabmod_CPPFLAGS = -Wall \
+					  $(FFT_INC) $(FFT_FLG) $(SIMD_CFLAGS) $(GITVERSION_FLAGS)
+odr_dabmod_LDADD    = $(FFT_LDADD)
 odr_dabmod_SOURCES  = DabMod.cpp \
-                      PcDebug.h \
-                      porting.c porting.h \
-                      DabModulator.cpp DabModulator.h  \
-                      Buffer.cpp Buffer.h \
-                      ModCodec.cpp ModCodec.h \
-                      ModPlugin.cpp ModPlugin.h \
-                      ModFormat.cpp ModFormat.h \
-                      EtiReader.cpp EtiReader.h \
-                      Eti.cpp Eti.h \
-                      FicSource.cpp FicSource.h \
+					  PcDebug.h \
+					  porting.c porting.h \
+					  DabModulator.cpp DabModulator.h  \
+					  Buffer.cpp Buffer.h \
+					  ModCodec.cpp ModCodec.h \
+					  ModPlugin.cpp ModPlugin.h \
+					  ModFormat.cpp ModFormat.h \
+					  EtiReader.cpp EtiReader.h \
+					  Eti.cpp Eti.h \
+					  FicSource.cpp FicSource.h \
 					  FIRFilter.cpp FIRFilter.h \
-                      ModInput.cpp ModInput.h \
-                      PuncturingRule.cpp PuncturingRule.h \
-                      PuncturingEncoder.cpp PuncturingEncoder.h \
-                      SubchannelSource.cpp SubchannelSource.h \
-                      Flowgraph.cpp Flowgraph.h \
-                      GainControl.cpp GainControl.h \
-                      OutputMemory.cpp OutputMemory.h \
+					  ModInput.cpp ModInput.h \
+					  PuncturingRule.cpp PuncturingRule.h \
+					  PuncturingEncoder.cpp PuncturingEncoder.h \
+					  SubchannelSource.cpp SubchannelSource.h \
+					  Flowgraph.cpp Flowgraph.h \
+					  GainControl.cpp GainControl.h \
+					  OutputMemory.cpp OutputMemory.h \
+					  OutputZeroMQ.cpp OutputZeroMQ.h \
 					  TimestampDecoder.h TimestampDecoder.cpp \
-                      $(UHD_SOURCES) \
-                      ModOutput.cpp ModOutput.h \
-                      InputMemory.cpp InputMemory.h \
+					  OutputUHD.cpp OutputUHD.h \
+					  ModOutput.cpp ModOutput.h \
+					  InputMemory.cpp InputMemory.h \
 					  InputFileReader.cpp InputZeroMQReader.cpp InputReader.h \
-                      OutputFile.cpp OutputFile.h \
-                      FrameMultiplexer.cpp FrameMultiplexer.h \
-                      ModMux.cpp ModMux.h \
-                      PrbsGenerator.cpp PrbsGenerator.h \
-                      BlockPartitioner.cpp BlockPartitioner.h \
-                      QpskSymbolMapper.cpp QpskSymbolMapper.h \
-                      FrequencyInterleaver.cpp FrequencyInterleaver.h \
-                      PhaseReference.cpp PhaseReference.h \
-                      DifferentialModulator.cpp DifferentialModulator.h \
-                      NullSymbol.cpp NullSymbol.h \
-                      SignalMultiplexer.cpp SignalMultiplexer.h \
-                      CicEqualizer.cpp CicEqualizer.h \
-                      OfdmGenerator.cpp OfdmGenerator.h \
-                      GuardIntervalInserter.cpp GuardIntervalInserter.h \
-                      Resampler.cpp Resampler.h \
-                      ConvEncoder.cpp ConvEncoder.h \
-                      TimeInterleaver.cpp TimeInterleaver.h \
+					  OutputFile.cpp OutputFile.h \
+					  FrameMultiplexer.cpp FrameMultiplexer.h \
+					  ModMux.cpp ModMux.h \
+					  PrbsGenerator.cpp PrbsGenerator.h \
+					  BlockPartitioner.cpp BlockPartitioner.h \
+					  QpskSymbolMapper.cpp QpskSymbolMapper.h \
+					  FrequencyInterleaver.cpp FrequencyInterleaver.h \
+					  PhaseReference.cpp PhaseReference.h \
+					  DifferentialModulator.cpp DifferentialModulator.h \
+					  NullSymbol.cpp NullSymbol.h \
+					  SignalMultiplexer.cpp SignalMultiplexer.h \
+					  CicEqualizer.cpp CicEqualizer.h \
+					  OfdmGenerator.cpp OfdmGenerator.h \
+					  GuardIntervalInserter.cpp GuardIntervalInserter.h \
+					  Resampler.cpp Resampler.h \
+					  ConvEncoder.cpp ConvEncoder.h \
+					  TimeInterleaver.cpp TimeInterleaver.h \
 					  ThreadsafeQueue.h \
 					  Log.cpp Log.h \
 					  RemoteControl.cpp RemoteControl.h \
 					  zmq.hpp
 
-nodist_odr_dabmod_SOURCES	=$(FFT_SRC)
+nodist_odr_dabmod_SOURCES = $(FFT_SRC)
 
-dist_bin_SCRIPTS	=crc-dwap.py
+dist_bin_SCRIPTS = crc-dwap.py
 
-EXTRA_DIST	=kiss_fftsimd.c kiss_fftsimd.h
+if USE_KISS_FFT
+EXTRA_DIST = kiss_fftsimd.c kiss_fftsimd.h
 
 clean-local:
 	rm -rf $(FFT_DIR)
+
+endif
+