--- Gnu-Mach/i386/linux/Makefile.in	2020/09/02 04:41:57	1.1.1.1
+++ Gnu-Mach/i386/linux/Makefile.in	2020/09/02 04:44:24	1.1.1.2
@@ -31,7 +31,7 @@ CFLAGS = @CFLAGS@
 
 
 # Files for driver support.
-linux-c-files = version.c softirq.c dma.c resource.c printk.c \
+linux-c-files = version.c softirq.c delay.c dma.c resource.c printk.c \
 		bios32.c irq.c ctype.c vsprintf.c main.c misc.c sched.c \
 		kmem.c block.c setup.c
 
@@ -39,6 +39,7 @@ linux-c-files = version.c softirq.c dma.
 vpath %.c $(linuxsrcdir)/dev/kernel
 vpath %.c $(linuxsrcdir)/dev/init
 vpath %.c $(linuxsrcdir)/dev/arch/$(systype)/kernel
+vpath %.c $(linuxsrcdir)/dev/arch/$(systype)/lib
 vpath %.c $(linuxsrcdir)/dev/glue
 vpath %.c $(linuxsrcdir)/dev/lib
 
@@ -46,11 +47,12 @@ vpath %.c $(linuxsrcdir)/dev/lib
 vpath %.c $(linuxsrcdir)/src/kernel
 vpath %.c $(linuxsrcdir)/src/init
 vpath %.c $(linuxsrcdir)/src/arch/$(systype)/kernel
+vpath %.c $(linuxsrcdir)/src/arch/$(systype)/lib
 vpath %.c $(linuxsrcdir)/src/lib
 
 
 # XXX: Assembly source files must be treated separately... Uggg...
-linux-asm-files = delay.S semaphore.S
+linux-asm-files = semaphore.S
 vpath %.S $(linuxsrcdir)/dev/arch/$(systype)/lib
 vpath %.S $(linuxsrcdir)/src/arch/$(systype)/lib
 
@@ -81,7 +83,7 @@ linux-scsi-files = 53c78xx.c AM53C974.c
 	eata_dma.c eata_pio.c fdomain.c g_NCR5380.c gdth.c hosts.c in2000.c \
 	ncr53c8xx.c pas16.c ppa.c qlogicfas.c qlogicisp.c scsi.c scsi_ioctl.c \
 	scsi_proc.c scsicam.c sd.c sd_ioctl.c seagate.c sr.c sr_ioctl.c \
-	t128.c tmscsim.c tmscsiw.c u14-34f.c ultrastor.c wd7000.c
+	t128.c tmscsim.c u14-34f.c ultrastor.c wd7000.c
 vpath %.c $(linuxsrcdir)/dev/drivers/scsi
 vpath %.c $(linuxsrcdir)/src/drivers/scsi
 
@@ -205,3 +207,28 @@ mostlyclean: distclean
 
 maintainer-clean: mostlyclean
 	rm -f $(srcdir)/configure
+
+
+
+#
+# Dependency generation
+#
+
+# Include dependency files
+ifneq ($(no_deps),t)
+
+# For each .o file we need a .d file.
+-include $(subst .o,.d,$(filter %.o,$(linux-objs))) /dev/null
+
+endif
+
+# Generic rule for $(CC) based compilation for making dependencies
+define make-deps
+set -e; $(CC) $(CFLAGS) $(CPPFLAGS) -M -MG $< | \
+	sed > $@.new -e 's/$*\.o:/$*.o $@:/'
+mv -f $@.new $@
+endef
+
+%.d: %.c $(before-compile); $(make-deps)
+%.d: %.S $(before-compile); $(make-deps)
+