--- Makefile.in.orig	Tue Aug 14 09:57:25 2001
+++ Makefile.in	Tue Aug 14 09:58:37 2001
@@ -276,13 +276,13 @@
 	sed -n 's/^kernel\.a(\([^)]*\)).*$$/\1/p' $< | sort > $@
 kernel-unused: kernel.a.list kernel.map.list
 	(diff -u0 $^ || test $$? -eq 1) | sed -n '1,/@@/d;s/^-//p' > $@
-k%nel.o k%nel.map: $(OSKIT_LIBDIR)/multiboot.o $(osenv-overrides:=.o) k%nel.a
+kernel.o kernel.map: $(OSKIT_LIBDIR)/multiboot.o $(osenv-overrides:=.o) kernel.a
 	$(CC) $(CFLAGS) -nostdlib -nostartfiles $(LDFLAGS) -r \
 	      -o $(@:.map=.o) -Wl,-Map=$(@:.o=.map) \
 	      -Wl,-\( $^ $(OSKIT_LIBS) -Wl,-\) -lgcc
 # This rule has less overhead, but doesn't produce the intermediate
 # results necessary to compute `kernel-unused'.
-kernel.o: $(OSKIT_LIBDIR)/multiboot.o $(objfiles)
+not-kernel.o: $(OSKIT_LIBDIR)/multiboot.o $(objfiles)
 	$(CC) $(CFLAGS) -nostdlib -nostartfiles $(LDFLAGS) -r -o $@ \
 	      -Wl,-\( $^ $(OSKIT_LIBS) -Wl,-\) -lgcc
 
@@ -296,14 +296,14 @@
 	      -o $@ \
 	      `sed 's/^/-Wl,-u,/' $<` -x c /dev/null -lc
 
-oskit-kern%.o: kern%.o clib-routines.o
+oskit-kernel.o: kernel.o clib-routines.o
 	$(CC) $(CFLAGS) -nostdlib -nostartfiles $(LDFLAGS) -r -o $@ \
 	      -Wl,-\( $^ -loskit_clientos -loskit_c $(OSKIT_LIBS) -Wl,-\) -lgcc
 
 %-undef-bad: %-undef Makefile
 	sed '$(foreach r,$(clib-routines) $(magic-symbols),/^$r$$/d;)' $< > $@
 
-kern%: oskit-kern%.o $(OSKIT_LIBDIR)/crtn.o
+kernel: oskit-kernel.o $(OSKIT_LIBDIR)/crtn.o
 	$(LD) $(LDFLAGS) $(KERN_LDFLAGS) -o $@ $^
 
 # This combined with the other pattern rules let you ask