Import backup from 2005-06-20

Makefile

@@ -16,7 +16,7 @@ UMOUNT=sudo umount
 # Do not print "Entering directory ..."
 MAKEFLAGS += --no-print-directory
 
-.PHONY:	all clean initrd apps grub_image install install_img
+.PHONY:	all clean initrd apps grub_image install install_img depend copy_image
 
 all:
 	make -C kernel
@@ -47,22 +47,16 @@ grub_image:
 	rm grub_commands.tmp
 	rm grub_image_device.map.tmp
 
-install:
-	gzip -c $(INITRD) > $(INITRD).gz
-	-mkdir $(FLOPPY_MOUNT)
-	$(MOUNT) -t ext2 $(DEVICE) $(FLOPPY_MOUNT)
-	-cp kernel/kernel.bin $(FLOPPY_MOUNT)
-	-cp rmmod/rmmod.bin $(FLOPPY_MOUNT)
-	-cp menu.lst $(FLOPPY_MOUNT)/boot/grub
-	-cp $(INITRD).gz $(FLOPPY_MOUNT)/$(INITRD).gz
-	$(UMOUNT) $(FLOPPY_MOUNT)
-	-rmdir $(FLOPPY_MOUNT)
-
-install_img:
-	gzip -c $(INITRD) > $(INITRD).gz
-	-mkdir $(FLOPPY_MOUNT)
+copy_image:
 	cp $(GRUB_IMAGE) $(FLOPPY_IMAGE)
-	$(MOUNT) -t ext2 -o loop $(FLOPPY_IMAGE) $(FLOPPY_MOUNT)
+
+install:	FDEV=$(FLOPPY)
+install_img:	FDEV=$(FLOPPY_IMAGE)
+install_img:	MOUNT_FLAGS=-o loop
+install_img: copy_image
+install install_img:
+	-mkdir $(FLOPPY_MOUNT)
+	$(MOUNT) -t ext2 $(MOUNT_FLAGS) $(FDEV) $(FLOPPY_MOUNT)
 	-cp kernel/kernel.bin $(FLOPPY_MOUNT)
 	-cp rmmod/rmmod.bin $(FLOPPY_MOUNT)
 	-cp menu.lst $(FLOPPY_MOUNT)/boot/grub
@@ -78,7 +72,10 @@ initrd:
 	cp -Pr $(INITRD_DIR)/* $(INITRD_MOUNT)
 	$(UMOUNT) $(INITRD_MOUNT)
 	rm -rf $(INITRD_MOUNT)
+	gzip -c $(INITRD) > $(INITRD).gz
 
+depend:
+	make -C kernel depend
 
 wordcount:
 	find . -regex '\(.*\.[ch]\)\|\(.*\.asm\)\|\(.*\.inc\)\|\(.*\.cpp\)' | xargs cat | wc