Restructure: Move sdr from common code to 'libsdr'

src/tv/Makefile.am

@@ -16,29 +16,28 @@ 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) \
 	$(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) \
 	-lm
 
+if HAVE_SDR
+osmotv_LDADD += \
+	$(top_builddir)/src/libsdr/libsdr.a \
+	$(top_builddir)/src/libfft/libfft.a
+endif
+
+osmotv_LDADD += \
+	$(top_builddir)/src/libtimer/libtimer.a
+
 if HAVE_SDR
 AM_CPPFLAGS += -DHAVE_SDR
 endif
 
-if HAVE_UHD
-AM_CPPFLAGS += -DHAVE_UHD
-endif
-
-if HAVE_SOAPY
-AM_CPPFLAGS += -DHAVE_SOAPY
-endif
-
 if ENABLE_MAGICK
 AM_CPPFLAGS += -DWITH_MAGICK
 endif

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"