aboutsummaryrefslogtreecommitdiffstats
path: root/src/tv
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-17 22:51:18 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-12-03 08:45:45 +0100
commit1650cc5ad2eba4fb8857ffc920170ae0f9f1a18d (patch)
tree8af7057e2205de7548c70998c46e5ede8eabbad4 /src/tv
parent45a5568f7032b11953d6ac4321970d5780eaf613 (diff)
Restructure: Move sdr from common code to 'libsdr'
Diffstat (limited to 'src/tv')
-rw-r--r--src/tv/Makefile.am15
-rw-r--r--src/tv/main.c4
2 files changed, 9 insertions, 10 deletions
diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am
index da94296..d1677e4 100644
--- a/src/tv/Makefile.am
+++ b/src/tv/Makefile.am
@@ -16,11 +16,9 @@ osmotv_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libimage/libimage.a \
$(top_builddir)/src/common/libcommon.a \
- $(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
- $(top_builddir)/src/libfft/libfft.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
@@ -28,15 +26,16 @@ osmotv_LDADD = \
-lm
if HAVE_SDR
-AM_CPPFLAGS += -DHAVE_SDR
+osmotv_LDADD += \
+ $(top_builddir)/src/libsdr/libsdr.a \
+ $(top_builddir)/src/libfft/libfft.a
endif
-if HAVE_UHD
-AM_CPPFLAGS += -DHAVE_UHD
-endif
+osmotv_LDADD += \
+ $(top_builddir)/src/libtimer/libtimer.a
-if HAVE_SOAPY
-AM_CPPFLAGS += -DHAVE_SOAPY
+if HAVE_SDR
+AM_CPPFLAGS += -DHAVE_SDR
endif
if ENABLE_MAGICK
diff --git a/src/tv/main.c b/src/tv/main.c
index 8663952..ed4558f 100644
--- a/src/tv/main.c
+++ b/src/tv/main.c
@@ -34,8 +34,8 @@ enum paging_signal;
#include "../libimage/img.h"
#include "../common/debug.h"
#ifdef HAVE_SDR
-#include "../common/sdr_config.h"
-#include "../common/sdr.h"
+#include "../libsdr/sdr_config.h"
+#include "../libsdr/sdr.h"
#endif
#include "bas.h"
#include "tv_modulate.h"