Index: Makefile
===================================================================
--- Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -30,5 +30,5 @@
 #
 
-.PHONY: all config distclean clean cscope
+.PHONY: all config config_default distclean clean cscope
 
 all: Makefile.config config.h config.defs
@@ -37,8 +37,14 @@
 	$(MAKE) -C boot
 
-Makefile.config config.h config.defs: HelenOS.config
+Makefile.config: config_default
+
+config.h: config_default
+
+config.defs: config_default
+
+config_default: HelenOS.config
 	tools/config.py HelenOS.config default
 
-config:
+config: HelenOS.config
 	tools/config.py HelenOS.config
 
Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -33,9 +33,4 @@
 
 DIRS = \
-	lib/libc \
-	lib/libfs \
-	lib/libblock \
-	lib/softint \
-	lib/softfloat \
 	srv/bd/ata_bd \
 	srv/bd/file_bd \
@@ -76,8 +71,18 @@
 endif
 
+LIBC = lib/libc
+LIBS = \
+	lib/libfs \
+	lib/libblock \
+	lib/softint \
+	lib/softfloat
+
+LIBC_BUILD = $(addsuffix .build,$(LIBC))
+LIBS_BUILD = $(addsuffix .build,$(LIBS))
+
 BUILDS := $(addsuffix .build,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS))
+CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
 
-.PHONY: all $(BUILDS) $(CLEANS) clean
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
 
 all: ../Makefile.config ../config.h ../config.defs $(BUILDS)
@@ -88,4 +93,10 @@
 	-$(MAKE) -C $(basename $@) clean
 
-$(BUILDS):
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
 	$(MAKE) -C $(basename $@) all
+
+$(LIBS_BUILD): $(LIBC_BUILD)
+	$(MAKE) -C $(basename $@) all
+
+$(LIBC_BUILD):
+	$(MAKE) -C $(basename $@) all
Index: uspace/app/bdsh/Makefile
===================================================================
--- uspace/app/bdsh/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/bdsh/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -117,7 +117,7 @@
 
 # Everything else is a phony target
-.PHONY: all clean distclean depend disasm
+.PHONY: all clean distclean depend
 
-all: $(PROGRAM) disasm
+all: $(PROGRAM) $(PROGRAM).disasm
 
 clean:
@@ -131,6 +131,6 @@
 	@echo ''
 
-disasm:
-	$(OBJDUMP) -d $(PROGRAM) >$(PROGRAM).disasm
+$(PROGRAM).disasm: $(PROGRAM)
+	$(OBJDUMP) -d $< > $@
 
 distclean: clean
Index: uspace/app/edit/Makefile
===================================================================
--- uspace/app/edit/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/edit/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -48,5 +48,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -63,6 +63,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/app/getvc/Makefile
===================================================================
--- uspace/app/getvc/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/getvc/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -50,5 +50,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -65,6 +65,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/app/init/Makefile
===================================================================
--- uspace/app/init/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/init/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/app/klog/Makefile
===================================================================
--- uspace/app/klog/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/klog/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/tester/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -78,6 +78,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/app/tetris/Makefile
===================================================================
--- uspace/app/tetris/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/tetris/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -10,5 +10,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -25,6 +25,4 @@
 	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/app/trace/Makefile
===================================================================
--- uspace/app/trace/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/app/trace/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -52,7 +52,7 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
-all: $(OUTPUT) disasm
+all: $(OUTPUT) $(OUTPUT).disasm
 
 -include Makefile.depend
@@ -67,6 +67,6 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm:
-	$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+	$(OBJDUMP) -d $< > $@
 
 %.o: %.S
Index: uspace/lib/libc/Makefile
===================================================================
--- uspace/lib/libc/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/lib/libc/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -96,10 +96,5 @@
 .PHONY: all clean depend kerninc
 
-all: kerninc libc.a arch/$(UARCH)/_link.ld
-
-kerninc:
-	ln -sfn ../../../../kernel/generic/include include/kernel
-	ln -sfn kernel/arch include/arch
-	ln -sfn ../arch/$(UARCH)/include include/libarch
+all: libc.a
 
 -include Makefile.depend
@@ -109,9 +104,14 @@
 	find generic/ arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
 
-depend: kerninc
+depend: kerninc arch/$(UARCH)/_link.ld
 	-makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
 	$(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
+
+kerninc:
+	ln -sfn ../../../../kernel/generic/include include/kernel
+	ln -sfn kernel/arch include/arch
+	ln -sfn ../arch/$(UARCH)/include include/libarch
 
 arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
Index: uspace/srv/bd/ata_bd/Makefile
===================================================================
--- uspace/srv/bd/ata_bd/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/bd/ata_bd/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/bd/file_bd/Makefile
===================================================================
--- uspace/srv/bd/file_bd/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/bd/file_bd/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/bd/gxe_bd/Makefile
===================================================================
--- uspace/srv/bd/gxe_bd/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/bd/gxe_bd/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/bd/rd/Makefile
===================================================================
--- uspace/srv/bd/rd/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/bd/rd/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/cir/fhc/Makefile
===================================================================
--- uspace/srv/cir/fhc/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/cir/fhc/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/cir/obio/Makefile
===================================================================
--- uspace/srv/cir/obio/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/cir/obio/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,5 +47,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -62,6 +62,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/console/Makefile
===================================================================
--- uspace/srv/console/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/console/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -67,5 +67,5 @@
 OBJECTS := $(GENERIC_OBJECTS)
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -81,6 +81,4 @@
 $(OUTPUT): $(OBJECTS) $(LIBS)
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-
-disasm: $(OUTPUT).disasm
 
 $(OUTPUT).disasm: $(OUTPUT)
Index: uspace/srv/devmap/Makefile
===================================================================
--- uspace/srv/devmap/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/devmap/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -48,5 +48,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -63,6 +63,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/fb/Makefile
===================================================================
--- uspace/srv/fb/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/fb/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -86,5 +86,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -101,6 +101,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/fs/devfs/Makefile
===================================================================
--- uspace/srv/fs/devfs/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/fs/devfs/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -36,5 +36,5 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS += -I $(LIBFS_PREFIX) 
+CFLAGS += -I $(LIBFS_PREFIX)
 
 LIBS = \
@@ -53,5 +53,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -68,6 +68,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/fs/fat/Makefile
===================================================================
--- uspace/srv/fs/fat/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/fs/fat/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -57,5 +57,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -72,6 +72,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/fs/tmpfs/Makefile
===================================================================
--- uspace/srv/fs/tmpfs/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/fs/tmpfs/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -55,5 +55,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -70,6 +70,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/kbd/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -156,5 +156,5 @@
 OBJECTS := $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS)
 
-.PHONY: all clean depend disasm links
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -171,6 +171,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/loader/Makefile
===================================================================
--- uspace/srv/loader/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/loader/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -53,7 +53,7 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
-all: $(OUTPUT) disasm
+all: $(OUTPUT) $(OUTPUT).disasm
 
 -include Makefile.depend
@@ -68,6 +68,6 @@
 	$(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
 
-disasm:
-	$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+	$(OBJDUMP) -d $< > $@
 
 arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
Index: uspace/srv/ns/Makefile
===================================================================
--- uspace/srv/ns/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/ns/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -49,5 +49,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -64,6 +64,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/part/mbr_part/Makefile
===================================================================
--- uspace/srv/part/mbr_part/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/part/mbr_part/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -49,5 +49,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -64,6 +64,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@
Index: uspace/srv/pci/Makefile
===================================================================
--- uspace/srv/pci/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/pci/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -47,7 +47,7 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
-all: $(OUTPUT) disasm
+all: $(OUTPUT) $(OUTPUT).disasm
 
 -include Makefile.depend
@@ -64,6 +64,6 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm:
-	$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+$(OUTPUT).disasm: $(OUTPUT)
+	$(OBJDUMP) -d $< > $@
 
 %.o: %.S
Index: uspace/srv/vfs/Makefile
===================================================================
--- uspace/srv/vfs/Makefile	(revision c088fd4a0f5931862c58e36af784f67a36fb6109)
+++ uspace/srv/vfs/Makefile	(revision e035612a97a6dc9b7ae6bd3dc822df045dd8afdf)
@@ -52,5 +52,5 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all clean depend
 
 all: $(OUTPUT) $(OUTPUT).disasm
@@ -67,6 +67,4 @@
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
 $(OUTPUT).disasm: $(OUTPUT)
 	$(OBJDUMP) -d $< > $@