--- a/Makefile	Wed May 18 00:13:45 2011 +0200
+++ b/Makefile	Wed May 18 00:32:25 2011 +0200
@@ -51,18 +51,18 @@
 
 AUTOCONF=autoconf.h
 # note: the directory order below matters to ensure that we match the kernel order
-dirs=kernel mm crypto lib drivers/base drivers/net net
+dirs=kernel/ mm/ crypto/ lib/ drivers/base/ drivers/net/ net/
 empty:=
 space:= $(empty) $(empty)
 colon:= :
 comma= ,
-kernel_to_keep=notifier.o params.o time.o sysctl.o mutex.o \
+kernel/_to_keep=notifier.o params.o time.o sysctl.o mutex.o \
 rwsem.o semaphore.o srcu.o rcupdate.o rcutiny.o kfifo.o
-mm_to_keep=util.o
-crypto_to_keep=aead.o ahash.o shash.o api.o algapi.o cipher.o compress.o proc.o
-drivers/base_to_keep=class.o core.o bus.o dd.o driver.o devres.o module.o
-drivers/net_to_keep=loopback.o
-lib_to_keep=klist.o kobject.o kref.o hweight.o int_sqrt.o checksum.o \
+mm/_to_keep=util.o
+crypto/_to_keep=aead.o ahash.o shash.o api.o algapi.o cipher.o compress.o proc.o
+drivers/base/_to_keep=class.o core.o bus.o dd.o driver.o devres.o module.o
+drivers/net/_to_keep=loopback.o
+lib/_to_keep=klist.o kobject.o kref.o hweight.o int_sqrt.o checksum.o \
 find_last_bit.o find_next_bit.o bitmap.o nlattr.o idr.o libcrc32c.o \
 ctype.o string.o kasprintf.o rbtree.o sha1.o textsearch.o vsprintf.o \
 rwsem-spinlock.o scatterlist.o ratelimit.o hexdump.o dec_and_lock.o \
@@ -85,7 +85,7 @@
 linker.lds: ./generate-linker-script.py
 	ld -shared --verbose | ./$^ > $@
 
-KERNEL_BUILTIN=$(addprefix $(KERNEL_DIR)/,$(addsuffix /builtin.o,$(dirs)))
+KERNEL_BUILTIN=$(addprefix $(KERNEL_DIR)/,$(addsuffix builtin.o,$(dirs)))
 OBJS=$(SIM_OBJ) $(foreach builtin,$(KERNEL_BUILTIN),$(if $($(builtin)),$($(builtin))))
 
 %/builtin.o:

--- a/Makefile.print	Wed May 18 00:13:45 2011 +0200
+++ b/Makefile.print	Wed May 18 00:32:25 2011 +0200
@@ -1,7 +1,7 @@
 # inherit $(objdir) $(config) $(srcdir) $(to_keep) from command-line
 
 include $(config)
-include $(srcdir)/Makefile
+include $(srcdir)Makefile
 
 to_keep_list=$(subst :, ,$(to_keep))
 obj-y += $(lib-y)
@@ -20,15 +20,15 @@
 
 print: $(final-obj-m) $(subdirs)
 	@if test $(if $(final-obj-y),1); then \
-	  echo -n $(objdir)/builtin.o; echo -n "="; echo $(addprefix $(objdir)/,$(final-obj-y)); \
-	  echo -n $(objdir)/builtin.o; echo -n ": "; echo $(addprefix $(objdir)/,$(final-obj-y)); \
-	  echo -n "all-obj-for-clean+="; echo $(addprefix $(objdir)/,$(final-obj-y)) $(objdir)/builtin.o; \
+	  echo -n $(objdir)builtin.o; echo -n "="; echo $(addprefix $(objdir),$(final-obj-y)); \
+	  echo -n $(objdir)builtin.o; echo -n ": "; echo $(addprefix $(objdir),$(final-obj-y)); \
+	  echo -n "all-obj-for-clean+="; echo $(addprefix $(objdir),$(final-obj-y)) $(objdir)builtin.o; \
 	fi
 $(final-obj-m):
-	@echo -n "modules+="; echo $(addprefix $(objdir)/,$(@:.o=.ko))
-	@echo -n $(addprefix $(objdir)/,$(@:.o=.ko)); echo -n ": "
-	@echo $(addprefix $(objdir)/,$(if $($(@:.o=-objs)),$($(@:.o=-objs)),$@))
-	@echo -n $(addprefix $(objdir)/,$(@:.o=.ko)); echo -n "="
-	@echo $(addprefix $(objdir)/,$(if $($(@:.o=-objs)),$($(@:.o=-objs)),$@))
+	@echo -n "modules+="; echo $(addprefix $(objdir),$(@:.o=.ko))
+	@echo -n $(addprefix $(objdir),$(@:.o=.ko)); echo -n ": "
+	@echo $(addprefix $(objdir),$(if $($(@:.o=-objs)),$($(@:.o=-objs)),$@))
+	@echo -n $(addprefix $(objdir),$(@:.o=.ko)); echo -n "="
+	@echo $(addprefix $(objdir),$(if $($(@:.o=-objs)),$($(@:.o=-objs)),$@))
 $(subdirs):
-	@$(MAKE) -s -f $(firstword $(MAKEFILE_LIST)) objdir=$(objdir)/$@ config=$(config) srcdir=$(srcdir)/$@ to_keep=$(to_keep) print 2>/dev/null
+	@$(MAKE) -s -f $(firstword $(MAKEFILE_LIST)) objdir=$(objdir)$@/ config=$(config) srcdir=$(srcdir)$@/ to_keep=$(to_keep) print 2>/dev/null