diff --git a/Fir/Makefile b/Fir/Makefile
index 0ea0f6a..6d96f4f 100644
--- a/Fir/Makefile
+++ b/Fir/Makefile
@@ -4,7 +4,7 @@ NAME := Fir
 
 GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c
 
-INCLUDES += -I $(LIBSRC_PATH)
-DEFINES := -Dradio_float_t=float -Dfir_float_t=float
+INCLUDES ?= -I $(LIBSRC_PATH)
+DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Fir/config.mk b/Fir/config.mk
index 6ee737d..5736f44 100644
--- a/Fir/config.mk
+++ b/Fir/config.mk
@@ -1,6 +1,5 @@
 MAKE_HOME ?= /home/jens/work/software/make
 CONFIG ?= debug
 BUILD_DIR ?= ./build/${CONFIG}
-MAKEFLAGS += --no-print-directory
 
 LIBSRC_PATH ?= $(realpath ../../../libsrc)
diff --git a/JuceLibraryCode/Makefile b/JuceLibraryCode/Makefile
index c84e583..e58ca69 100644
--- a/JuceLibraryCode/Makefile
+++ b/JuceLibraryCode/Makefile
@@ -2,6 +2,8 @@ include ./config.mk
 
 NAME := Juce
 
+JUCE_MODULES := ${JUCE_PATH}/modules
+
 SOURCES := juce_audio_basics/juce_audio_basics.cpp
 SOURCES += juce_audio_devices/juce_audio_devices.cpp
 SOURCES += juce_audio_formats/juce_audio_formats.cpp
@@ -17,10 +19,10 @@ SOURCES += juce_gui_extra/juce_gui_extra.cpp
 SOURCES += juce_opengl/juce_opengl.cpp
 SOURCES += juce_video/juce_video.cpp
 
-CXX_SRCS += $(addprefix $(JUCE_MODULES)/, $(SOURCES))
-INCLUDES += -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
+CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES))
+INCLUDES ?= -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
 
-DEFINES_debug := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" 
-DEFINES_release := -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" 
+DEFINES_debug ?= -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" 
+DEFINES_release ?= -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" 
 
 include $(MAKE_HOME)/compile.mk
diff --git a/JuceLibraryCode/config.mk b/JuceLibraryCode/config.mk
index 9e93518..037cdf6 100644
--- a/JuceLibraryCode/config.mk
+++ b/JuceLibraryCode/config.mk
@@ -1,8 +1,6 @@
 MAKE_HOME ?= /home/jens/work/software/make
 CONFIG ?= debug
 BUILD_DIR ?= ./build/${CONFIG}
-MAKEFLAGS += --no-print-directory
 
 JUCE_PATH ?=  $(realpath ../../../extlib/JUCE)
-JUCE_MODULES := ${JUCE_PATH}/modules
 
diff --git a/Makefile b/Makefile
index 96f8fc4..a082e39 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 include ./config.mk
-export
 
+DEFINES := -Dradio_float_t=float -Dfir_float_t=float
 CXXFLAGS_release := -O3 -flto
 CFLAGS_release := -O3 -flto
 LDFLAGS_release := -O3 -flto
@@ -12,11 +12,25 @@ DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS
 
 all: app 
 app: objects link
-objects: 
-	@$(MAKE) -C JuceLibraryCode
-	@$(MAKE) -C Source
-	@$(MAKE) -C Radio
-	@$(MAKE) -C Crc
-	@$(MAKE) -C Fir
+
+.PHONY: JuceLibraryCode Radio Source Crc Fir
+
+objects: JuceLibraryCode Radio Source Crc Fir
 	
+JuceLibraryCode:
+	@$(MAKE) -C $@
+
+Radio:
+	@$(MAKE) -C $@
+
+Source:
+	@$(MAKE) -C $@
+
+Crc:
+	@$(MAKE) -C $@
+
+Fir:
+	@$(MAKE) -C $@
+
+
 include $(MAKE_HOME)/link.mk
diff --git a/Radio/Makefile b/Radio/Makefile
index 7e6341c..539f972 100644
--- a/Radio/Makefile
+++ b/Radio/Makefile
@@ -6,6 +6,10 @@ CXX_SRCS := $(LIBSRC_PATH)/cpp/radio/Formatter.cpp
 CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Symbolizer.cpp
 CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Scrambler.cpp
 CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Frame.cpp
+CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/Farrow.cpp
+CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/PolyPhase.cpp
+CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/UpSampler.cpp
+CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/DownSampler.cpp
 
 GCC_SRCS := $(LIBSRC_PATH)/radio/real.c
 GCC_SRCS += $(LIBSRC_PATH)/radio/cpx.c
@@ -18,7 +22,7 @@ GCC_SRCS += $(LIBSRC_PATH)/radio/statistics.c
 GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c
 GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c
 
-INCLUDES += -I $(LIBSRC_PATH)
-DEFINES := -Dradio_float_t=float -Dfir_float_t=float
+INCLUDES ?= -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
+DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Radio/config.mk b/Radio/config.mk
index 6ee737d..2cadf04 100644
--- a/Radio/config.mk
+++ b/Radio/config.mk
@@ -1,6 +1,6 @@
 MAKE_HOME ?= /home/jens/work/software/make
 CONFIG ?= debug
 BUILD_DIR ?= ./build/${CONFIG}
-MAKEFLAGS += --no-print-directory
 
 LIBSRC_PATH ?= $(realpath ../../../libsrc)
+EIGEN_PATH ?= $(realpath ../../../extlib/eigen)
diff --git a/Source/Makefile b/Source/Makefile
index 669ac15..9094c00 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -12,6 +12,6 @@ CXX_SRCS += IQPlaneComponent.cpp
 CXX_SRCS += MainComponent.cpp
 CXX_SRCS += Main.cpp
 
-INCLUDES += -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
+INCLUDES ?= -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
 
 include $(MAKE_HOME)/compile.mk
diff --git a/config.mk b/config.mk
index 84fffc4..b78d1a4 100644
--- a/config.mk
+++ b/config.mk
@@ -5,3 +5,7 @@ BUILD_DIR ?= $(shell pwd)/build/${CONFIG}
 MAKEFLAGS += --no-print-directory
 
 LIBSRC_PATH ?= $(realpath ../../libsrc)
+JUCE_PATH ?=  $(realpath ../../extlib/JUCE)
+EIGEN_PATH ?= $(realpath ../../extlib/eigen)
+
+export
\ No newline at end of file