Move linker to make room for trace preprocessor.

2 files changed, 8 insertions, 6 deletions

diff --git a/config.mk b/config.mk
index cc304611d..c9168c014 100644
--- a/config.mk
+++ b/config.mk
@@ -33,7 +33,7 @@ ${IMGDIR}/%.elf: kernel.ld ${OBJDIR}/*.o ${ROOTPATH}/src/kernel.ld
 	      -T ${ROOTPATH}/src/kernel.ld -o $@
 
 ${IMGDIR}/%.bin: ${IMGDIR}/%.elf $(wildcard ${IMGDIR}/*.so)
-	${ROOTPATH}/src/build/linker $@ $^
+	${ROOTPATH}/src/build/linker/linker $@ $^
 
 %.d:
 	cd ${basename $@} && ${MAKE}
diff --git a/src/build/makefile b/src/build/makefile
index d80e2b533..65042ad2b 100644
--- a/src/build/makefile
+++ b/src/build/makefile
@@ -1,7 +1,9 @@
-linker: linker.C
-	g++ -O3 -g linker.C -o linker -lbfd -I../include/sys
+ROOTPATH = ../..
 
-all: linker
+SUBDIRS = linker.d
 
-clean:
-	(rm -f linker)
+all: ${SUBDIRS}
+
+clean: $(patsubst %.d,%.clean, ${SUBDIRS})
+
+include ${ROOTPATH}/config.mk