diff --git a/Makefile b/Makefile
index d1c7cf3..688dbfd 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CFLAGS_release := -O3
 TARGET_ARCH := -march=native
 
 LIBDIR := -L$(LIBSRC_PATH)/fir -L$(LIBSRC_PATH)/crc -L$(LIBSRC_PATH)/radio
-LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -lradio -lfir -lcrc 
+LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -lfir -lcrc 
 LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/
 DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS
 
@@ -14,7 +14,7 @@ all: app
 app: objects link
 objects: 
 	@$(MAKE) -C JuceLibraryCode
-	@$(MAKE) -C Source
+	@$(MAKE) -C Source BUILD_DIR=${BUILD_DIR}/Source
 	@$(MAKE) -C Radio
 	
 include $(MAKE_HOME)/compile.mk
diff --git a/Radio/Makefile b/Radio/Makefile
index 92d01d0..122d964 100644
--- a/Radio/Makefile
+++ b/Radio/Makefile
@@ -7,6 +7,18 @@ CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Symbolizer.cpp
 CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Scrambler.cpp
 CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Frame.cpp
 
-INCLUDES += -I $(LIBSRC_PATH)/cpp -I $(LIBSRC_PATH)
+GCC_SRCS := $(LIBSRC_PATH)/radio/real.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/cpx.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/ringbuf.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/equalizer.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/interpolation.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/agc.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/nco.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/statistics.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c
+GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c
+
+INCLUDES += -I . -I $(LIBSRC_PATH)
+DEFINES := -Dradio_float_t=float -Dfir_float_t=float
 
 include $(MAKE_HOME)/compile.mk
diff --git a/config.mk b/config.mk
index 345ed56..049a71e 100644
--- a/config.mk
+++ b/config.mk
@@ -1,7 +1,7 @@
 MAKE_HOME ?= /home/jens/work/software/make
 CONFIG ?= debug
 TARGET ?= mpsk_receiver
-BUILD_DIR ?= $(CURDIR)/build/${CONFIG}
+BUILD_DIR ?= ./build/${CONFIG}
 MAKEFLAGS += --no-print-directory
 
 LIBSRC_PATH ?= $(realpath ../../libsrc)