Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -86,6 +86,4 @@
 
 clean: $(CLEANS)
-	find $(DIRS) -name '*.o' -follow -exec rm \{\} \;
-	find lib/libc -name "_link.ld" -exec rm \{\} \;
 
 distclean: clean
Index: uspace/app/init/Makefile
===================================================================
--- uspace/app/init/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/app/init/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -67,5 +67,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/app/klog/Makefile
===================================================================
--- uspace/app/klog/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/app/klog/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -55,5 +55,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/app/tester/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -68,5 +68,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/console/Makefile
===================================================================
--- uspace/srv/console/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/console/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -60,4 +60,6 @@
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 
+OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
+
 .PHONY: all clean depend disasm
 
@@ -67,11 +69,11 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
 	$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS)
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm
Index: uspace/srv/devmap/Makefile
===================================================================
--- uspace/srv/devmap/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/devmap/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -58,5 +58,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/fb/Makefile
===================================================================
--- uspace/srv/fb/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/fb/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -88,5 +88,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/fs/fat/Makefile
===================================================================
--- uspace/srv/fs/fat/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/fs/fat/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -65,5 +65,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/fs/tmpfs/Makefile
===================================================================
--- uspace/srv/fs/tmpfs/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/fs/tmpfs/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -63,5 +63,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/kbd/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -98,4 +98,6 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
+OBJECTS := $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS)
+
 .PHONY: all clean depend disasm links
 
@@ -109,11 +111,11 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend include/arch include/genarch
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend include/arch include/genarch $(OBJECTS)
 
 depend:
 	$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS)
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm
Index: uspace/srv/ns/Makefile
===================================================================
--- uspace/srv/ns/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/ns/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -54,5 +54,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/pci/Makefile
===================================================================
--- uspace/srv/pci/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/pci/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -55,5 +55,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 	$(MAKE) -C libpci clean
 
Index: uspace/srv/rd/Makefile
===================================================================
--- uspace/srv/rd/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/rd/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -54,5 +54,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend:
Index: uspace/srv/vfs/Makefile
===================================================================
--- uspace/srv/vfs/Makefile	(revision a1e28489b631244ed8c8d48d51a78fdd6c502794)
+++ uspace/srv/vfs/Makefile	(revision f0c9aff01d81837d08318925aeba53a675fd1af9)
@@ -60,5 +60,5 @@
 
 clean:
-	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 
 depend: