diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-02-18 11:46:12 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-02-18 11:46:12 +0100 |
| commit | fd33dd4329b591cc72ef30f1cefd9eb05cb1e560 (patch) | |
| tree | de8a74b43ac93de31c0b3f1fd3bc434efc0ffa09 /Makefile.am | |
| parent | eb15f7fc5e461c71a8d397d8fb34c27976876946 (diff) | |
| download | dabmux-fd33dd4329b591cc72ef30f1cefd9eb05cb1e560.tar.gz dabmux-fd33dd4329b591cc72ef30f1cefd9eb05cb1e560.tar.bz2 dabmux-fd33dd4329b591cc72ef30f1cefd9eb05cb1e560.zip | |
Rework timestamping
* Ensure MNSC and EDI carry the same timestamp
* Rename `edi_tistoffset` to `tist_offset`
* Remove conditional compilation of EDI output
* Reset PPS so as to align ETI frames across mux restarts
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index fb6bae3..3dbb918 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,19 +25,12 @@ else GITVERSION_FLAGS = endif -bin_PROGRAMS=odr-dabmux zmqinput-keygen +bin_PROGRAMS=odr-dabmux zmqinput-keygen odr-zmq2edi if HAVE_OUTPUT_RAW_TEST bin_PROGRAMS+=odr-zmq2farsync endif -if HAVE_EDI_TEST -bin_PROGRAMS+=odr-zmq2edi -CURL_LIBS =-lcurl -else -CURL_LIBS = -endif - FARSYNC_DIR=lib/farsync/linux INCLUDE=-I$(FARSYNC_DIR) -Ilib/charset -Ilib -Isrc @@ -60,7 +53,7 @@ lib_charset_sources = lib/charset/charset.cpp \ odr_dabmux_CFLAGS =-Wall $(INCLUDE) $(GITVERSION_FLAGS) odr_dabmux_CXXFLAGS =-Wall -std=c++11 $(INCLUDE) $(GITVERSION_FLAGS) $(BOOST_CPPFLAGS) $(ZMQ_CPPFLAGS) -odr_dabmux_LDADD =$(ZMQ_LIBS) $(CURL_LIBS) $(BOOST_LDFLAGS) \ +odr_dabmux_LDADD =$(ZMQ_LIBS) $(BOOST_LDFLAGS) \ -lpthread $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) $(BOOST_ASIO_LIB) odr_dabmux_SOURCES =src/DabMux.cpp \ |