diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2023-11-21 22:12:14 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2023-11-21 22:12:14 +0100 |
| commit | 5fe36a627405b8fc65bdb212a6d505b9a6c8e489 (patch) | |
| tree | 8646d654e0467be8603c5ad37fb6cd89656dfd26 /Makefile.am | |
| parent | 477ac4639a7c7f74f07a6164096fc7de102528ff (diff) | |
| parent | f84065c3cc6fff0edb771f85190f7228f4d740b6 (diff) | |
| download | dabmod-5fe36a627405b8fc65bdb212a6d505b9a6c8e489.tar.gz dabmod-5fe36a627405b8fc65bdb212a6d505b9a6c8e489.tar.bz2 dabmod-5fe36a627405b8fc65bdb212a6d505b9a6c8e489.zip | |
Merge branch 'dexter' into next
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 39280fb..d29b530 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Copyright (C) 2007, 2008, 2009, 2010 Her Majesty the Queen in Right # of Canada (Communications Research Center Canada) # -# Copyright (C) 2018 +# Copyright (C) 2023 # Matthias P. Braendli, matthias.braendli@mpb.li # # http://opendigitalradio.org @@ -37,15 +37,17 @@ bin_PROGRAMS = odr-dabmod odr_dabmod_CFLAGS = -Wall -Isrc -Ilib \ $(GITVERSION_FLAGS) -odr_dabmod_CXXFLAGS = -Wall -Isrc -Ilib -std=c++11 \ +odr_dabmod_CXXFLAGS = -Wall -Isrc -Ilib \ $(GITVERSION_FLAGS) $(BOOST_CPPFLAGS) -odr_dabmod_LDADD = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) +odr_dabmod_LDADD = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) $(UHD_LIBS) $(LIMESDR_LIBS) $(ADDITIONAL_UHD_LIBS) odr_dabmod_SOURCES = src/DabMod.cpp \ src/PcDebug.h \ src/DabModulator.cpp \ src/DabModulator.h \ src/Buffer.cpp \ src/Buffer.h \ + src/CharsetTools.cpp \ + src/CharsetTools.h \ src/ConfigParser.cpp \ src/ConfigParser.h \ src/ModPlugin.cpp \ @@ -54,6 +56,10 @@ odr_dabmod_SOURCES = src/DabMod.cpp \ src/EtiReader.h \ src/Eti.cpp \ src/Eti.h \ + src/Events.cpp \ + src/Events.h \ + src/FigParser.cpp \ + src/FigParser.h \ src/FicSource.cpp \ src/FicSource.h \ src/PuncturingRule.cpp \ @@ -75,7 +81,6 @@ odr_dabmod_SOURCES = src/DabMod.cpp \ src/InputMemory.h \ src/InputReader.h \ src/InputTcpReader.cpp \ - src/InputZeroMQReader.cpp \ src/OutputFile.cpp \ src/OutputFile.h \ src/FrameMultiplexer.cpp \ @@ -99,6 +104,8 @@ odr_dabmod_SOURCES = src/DabMod.cpp \ lib/RemoteControl.h \ lib/Log.cpp \ lib/Log.h \ + lib/Json.h \ + lib/Json.cpp \ lib/Globals.cpp \ lib/INIReader.h \ lib/crc.h \ @@ -123,10 +130,7 @@ odr_dabmod_SOURCES = src/DabMod.cpp \ lib/edi/ETIDecoder.hpp \ lib/edi/ETIDecoder.cpp \ lib/edi/PFT.hpp \ - lib/edi/PFT.cpp - -if !COMPILE_FOR_EASYDABV3 -odr_dabmod_SOURCES += \ + lib/edi/PFT.cpp \ src/FIRFilter.cpp \ src/FIRFilter.h \ src/MemlessPoly.cpp \ @@ -138,6 +142,8 @@ odr_dabmod_SOURCES += \ src/output/SDR.cpp \ src/output/SDR.h \ src/output/SDRDevice.h \ + src/output/Dexter.cpp \ + src/output/Dexter.h \ src/output/Soapy.cpp \ src/output/Soapy.h \ src/output/UHD.cpp \ @@ -171,7 +177,5 @@ odr_dabmod_SOURCES += \ src/TII.cpp \ src/TII.h -odr_dabmod_LDADD += $(UHD_LIBS) $(LIMESDR_LIBS) $(ADDITIONAL_UHD_LIBS) -endif man_MANS = man/odr-dabmod.1 |