Index: uspace/srv/bd/ata_bd/Makefile
===================================================================
--- uspace/srv/bd/ata_bd/Makefile	(revision 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/bd/ata_bd/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/bd/file_bd/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/bd/gxe_bd/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/bd/rd/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/cir/fhc/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/cir/obio/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/console/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/devmap/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/fb/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/fs/devfs/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/fs/fat/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/fs/tmpfs/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/kbd/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/loader/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/ns/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/part/mbr_part/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/pci/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 0da4e41be5a0b7a29e97e1f87816593416d3db04)
+++ uspace/srv/vfs/Makefile	(revision b4655da89eb65d1571b8afdfdbbb34449add2ef7)
@@ -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 $< > $@