diff -urN linux/arch/arm/boot/Makefile linux.make-cleanups/arch/arm/boot/Makefile
--- linux/arch/arm/boot/Makefile	Sun Apr 12 11:42:15 1998
+++ linux.make-cleanups/arch/arm/boot/Makefile	Fri Feb 25 12:29:54 2000
@@ -10,19 +10,19 @@
 
 SYSTEM	=$(TOPDIR)/vmlinux
 
-Image:	$(CONFIGURE) $(SYSTEM)
+Image:	$(SYSTEM)
 	$(OBJCOPY) $(SYSTEM) $@
 
-zImage:	$(CONFIGURE) compressed/vmlinux
+zImage:	compressed/vmlinux
 	$(OBJCOPY) compressed/vmlinux $@
 
 compressed/vmlinux: $(TOPDIR)/vmlinux dep
 	@$(MAKE) -C compressed vmlinux
 
-install: $(CONFIGURE) Image
+install: Image
 	sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) Image $(TOPDIR)/System.map "$(INSTALL_PATH)"
 
-zinstall: $(CONFIGURE) zImage
+zinstall: zImage
 	sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
 
 clean:
diff -urN linux/arch/i386/boot/Makefile linux.make-cleanups/arch/i386/boot/Makefile
--- linux/arch/i386/boot/Makefile	Mon Dec 20 14:43:39 1999
+++ linux.make-cleanups/arch/i386/boot/Makefile	Fri Feb 25 12:28:08 2000
@@ -12,11 +12,11 @@
 		$(TOPDIR)/include/linux/autoconf.h \
 		$(TOPDIR)/include/asm/boot.h
 
-zImage: $(CONFIGURE) bootsect setup compressed/vmlinux tools/build
+zImage: bootsect setup compressed/vmlinux tools/build
 	$(OBJCOPY) compressed/vmlinux compressed/vmlinux.out
 	tools/build bootsect setup compressed/vmlinux.out $(ROOT_DEV) > zImage
 
-bzImage: $(CONFIGURE) bbootsect bsetup compressed/bvmlinux tools/build
+bzImage: bbootsect bsetup compressed/bvmlinux tools/build
 	$(OBJCOPY) compressed/bvmlinux compressed/bvmlinux.out
 	tools/build -b bbootsect bsetup compressed/bvmlinux.out $(ROOT_DEV) > bzImage
 
@@ -29,14 +29,14 @@
 zdisk: $(BOOTIMAGE)
 	dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0
 
-zlilo: $(CONFIGURE) $(BOOTIMAGE)
+zlilo: $(BOOTIMAGE)
 	if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
 	if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
 	cat $(BOOTIMAGE) > $(INSTALL_PATH)/vmlinuz
 	cp $(TOPDIR)/System.map $(INSTALL_PATH)/
 	if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
 
-install: $(CONFIGURE) $(BOOTIMAGE)
+install: $(BOOTIMAGE)
 	sh -x ./install.sh $(KERNELRELEASE) $(BOOTIMAGE) $(TOPDIR)/System.map "$(INSTALL_PATH)"
 
 tools/build: tools/build.c
diff -urN linux/arch/mips/boot/Makefile linux.make-cleanups/arch/mips/boot/Makefile
--- linux/arch/mips/boot/Makefile	Fri Jun 25 17:40:12 1999
+++ linux.make-cleanups/arch/mips/boot/Makefile	Fri Feb 25 12:30:26 2000
@@ -32,7 +32,7 @@
 
 all: vmlinux.ecoff addinitrd
 
-vmlinux.ecoff:	$(CONFIGURE) elf2ecoff $(TOPDIR)/vmlinux
+vmlinux.ecoff:	elf2ecoff $(TOPDIR)/vmlinux
 	./elf2ecoff $(TOPDIR)/vmlinux vmlinux.ecoff $(E2EFLAGS)
 
 elf2ecoff: elf2ecoff.c
diff -urN linux/arch/sh/boot/Makefile linux.make-cleanups/arch/sh/boot/Makefile
--- linux/arch/sh/boot/Makefile	Mon Aug 30 18:12:59 1999
+++ linux.make-cleanups/arch/sh/boot/Makefile	Fri Feb 25 12:31:07 2000
@@ -22,7 +22,7 @@
 #
 # Fake compressed boot
 #
-zImage:	$(CONFIGURE) mkboot $(TOPDIR)/vmlinux
+zImage:	mkboot $(TOPDIR)/vmlinux
 	$(OBJCOPY) $(strip-flags) $(TOPDIR)/vmlinux zImage.tmp
 	./mkboot zImage.tmp zImage
 	rm -f zImage.tmp
diff -urN linux/drivers/Makefile linux.make-cleanups/drivers/Makefile
--- linux/drivers/Makefile	Thu Feb 17 09:57:13 2000
+++ linux.make-cleanups/drivers/Makefile	Fri Feb 25 12:46:07 2000
@@ -7,11 +7,16 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile.
 
-SUB_DIRS     := block char net parport sound misc
+SUB_DIRS     := block char net parport misc
 MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi sbus cdrom isdn pnp i2o ieee1394 \
-				macintosh video dio zorro fc4 usb \
+				sound macintosh video dio zorro fc4 usb \
 				nubus tc atm pcmcia i2c telephony
+
+ifdef CONFIG_SOUND
+SUB_DIRS += sound
+MOD_SUB_DIRS += sound
+endif
 
 ifdef CONFIG_DIO
 SUB_DIRS += dio