diff --git a/Crc/Makefile b/Crc/Makefile
new file mode 100644
index 0000000..7cf48b4
--- /dev/null
+++ b/Crc/Makefile
@@ -0,0 +1,9 @@
+include ./config.mk
+
+NAME := Crc
+
+GCC_SRCS := $(LIBSRC_PATH)/crc/crc.c
+
+INCLUDES += -I $(LIBSRC_PATH)
+
+include $(MAKE_HOME)/compile.mk
diff --git a/Crc/config.mk b/Crc/config.mk
new file mode 100644
index 0000000..6ee737d
--- /dev/null
+++ b/Crc/config.mk
@@ -0,0 +1,6 @@
+MAKE_HOME ?= /home/jens/work/software/make
+CONFIG ?= debug
+BUILD_DIR ?= ./build/${CONFIG}
+MAKEFLAGS += --no-print-directory
+
+LIBSRC_PATH ?= $(realpath ../../../libsrc)
diff --git a/Fir/Makefile b/Fir/Makefile
new file mode 100644
index 0000000..3d6dce8
--- /dev/null
+++ b/Fir/Makefile
@@ -0,0 +1,9 @@
+include ./config.mk
+
+NAME := Fir
+
+GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c
+
+INCLUDES += -I $(LIBSRC_PATH)
+
+include $(MAKE_HOME)/compile.mk
diff --git a/Fir/config.mk b/Fir/config.mk
new file mode 100644
index 0000000..6ee737d
--- /dev/null
+++ b/Fir/config.mk
@@ -0,0 +1,6 @@
+MAKE_HOME ?= /home/jens/work/software/make
+CONFIG ?= debug
+BUILD_DIR ?= ./build/${CONFIG}
+MAKEFLAGS += --no-print-directory
+
+LIBSRC_PATH ?= $(realpath ../../../libsrc)
diff --git a/Makefile b/Makefile
index ccad71d..597f1f7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,7 @@ CXXFLAGS_release := -O3
 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 -lfir -lcrc 
+LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt 
 LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/
 DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS
 
@@ -16,5 +15,7 @@ objects:
 	@$(MAKE) -C JuceLibraryCode
 	@$(MAKE) -C Source
 	@$(MAKE) -C Radio
+	@$(MAKE) -C Crc
+	@$(MAKE) -C Fir
 	
 include $(MAKE_HOME)/link.mk
diff --git a/Radio/Makefile b/Radio/Makefile
index 122d964..7e6341c 100644
--- a/Radio/Makefile
+++ b/Radio/Makefile
@@ -18,7 +18,7 @@ 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)
+INCLUDES += -I $(LIBSRC_PATH)
 DEFINES := -Dradio_float_t=float -Dfir_float_t=float
 
 include $(MAKE_HOME)/compile.mk