Removed RADIOBERRY

diff --git a/Makefile b/Makefile
index a52f6fc07c0cf0c55f3fe9b84f5b5c889e0927cc..79a7b2fecda0e684119a0d830f1d1995a8d78645 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,6 @@ PURESIGNAL_INCLUDE=PURESIGNAL
 # uncomment the line below to include MIDI support
 MIDI_INCLUDE=MIDI
 
-# uncomment the line below when Radioberry radio cape is plugged in (for now use emulator and old protocol)
-#RADIOBERRY_INCLUDE=RADIOBERRY
-
 # uncomment the line below for various debug facilities
 #DEBUG_OPTION=-D DEBUG
 
@@ -103,10 +100,6 @@ ozyio.o
 endif
 
 
-ifeq ($(RADIOBERRY_INCLUDE),RADIOBERRY)
-RADIOBERRY_OPTIONS=-D RADIOBERRY
-endif
-
 ifeq ($(SOAPYSDR_INCLUDE),SOAPYSDR)
 SOAPYSDR_OPTIONS=-D SOAPYSDR
 SOAPYSDRLIBS=-lSoapySDR
@@ -215,7 +208,7 @@ AUDIO_LIBS=-lasound
 
 CFLAGS=        -g -Wno-deprecated-declarations -O3
 OPTIONS=$(MIDI_OPTIONS) $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) \
-       $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(RADIOBERRY_OPTIONS) \
+       $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) \
        $(PSK_OPTIONS) $(STEMLAB_OPTIONS) $(CONTROLLER2_OPTIONS) \
        -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION)
 

diff --git a/Makefile.mac b/Makefile.mac
index 63f38933140c3032cd08f0835fbbeb3352446206..f15eb9b90eb443e42ebd2e368f27b8de05243e96 100644 (file)
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -44,9 +44,6 @@ STEMLAB_DISCOVERY=STEMLAB_DISCOVERY_NOAVAHI
 # uncomment the line below to include MIDI support
 MIDI_INCLUDE=MIDI
 
-# uncomment the line below when Radioberry radio cape is plugged in (for now use emulator and old protocol)
-#RADIOBERRY_INCLUDE=RADIOBERRY
-
 # uncomment the line below for various debug facilities
 #DEBUG_OPTION=-D DEBUG
 
@@ -103,10 +100,6 @@ ozyio.o
 endif
 
 
-ifeq ($(RADIOBERRY_INCLUDE),RADIOBERRY)
-RADIOBERRY_OPTIONS=-D RADIOBERRY
-endif
-
 ifeq ($(SOAPYSDR_INCLUDE),SOAPYSDR)
 SOAPYSDR_OPTIONS=-D SOAPYSDR
 SOAPYSDRLIBS=-lSoapySDR
@@ -214,7 +207,7 @@ AUDIO_LIBS=-lportaudio -O3
 
 CFLAGS=        -g -Wno-deprecated-declarations
 OPTIONS=$(MIDI_OPTIONS) $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) \
-       $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(RADIOBERRY_OPTIONS) \
+       $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) \
        $(PSK_OPTIONS) $(STEMLAB_OPTIONS) \
         $(CONTROLLER2_OPTIONS) $(AUDIO_OPTIONS) \
        -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION)