summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am8
-rw-r--r--src/OutputUHD.cpp4
-rw-r--r--src/OutputUHD.h3
3 files changed, 8 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 635a3d8..922ce52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,12 +22,6 @@ else
GITVERSION_FLAGS =
endif
-if HAVE_OUTPUT_UHD_TEST
-UHD_SOURCES = OutputUHD.cpp OutputUHD.h
-else
-UHD_SOURCES =
-endif
-
if HAVE_SSE
SIMD_CFLAGS = -msse -msse2
else
@@ -92,7 +86,7 @@ odr_dabmod_SOURCES = DabMod.cpp \
OutputMemory.cpp OutputMemory.h \
OutputZeroMQ.cpp OutputZeroMQ.h \
TimestampDecoder.h TimestampDecoder.cpp \
- $(UHD_SOURCES) \
+ OutputUHD.cpp OutputUHD.h \
ModOutput.cpp ModOutput.h \
InputMemory.cpp InputMemory.h \
InputFileReader.cpp InputZeroMQReader.cpp InputReader.h \
diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp
index 3d8eea6..8063e75 100644
--- a/src/OutputUHD.cpp
+++ b/src/OutputUHD.cpp
@@ -25,6 +25,9 @@
*/
#include "OutputUHD.h"
+
+#ifdef HAVE_OUTPUT_UHD
+
#include "PcDebug.h"
#include "Log.h"
#include "RemoteControl.h"
@@ -652,3 +655,4 @@ const string OutputUHD::get_parameter(const string& parameter) const
return ss.str();
}
+#endif // HAVE_OUTPUT_UHD
diff --git a/src/OutputUHD.h b/src/OutputUHD.h
index ef9740d..a2ffb7d 100644
--- a/src/OutputUHD.h
+++ b/src/OutputUHD.h
@@ -42,6 +42,8 @@ DESCRIPTION:
# include <config.h>
#endif
+#ifdef HAVE_OUTPUT_UHD
+
#include <uhd/utils/thread_priority.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/usrp/multi_usrp.hpp>
@@ -230,6 +232,7 @@ class OutputUHD: public ModOutput, public RemoteControllable {
size_t lastLen;
};
+#endif // HAVE_OUTPUT_UHD
#endif // OUTPUT_UHD_H