Fix dependency problems in the build

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index 78efeff19f70e782dbf78700b72446a9b1058695..fa90894520d930fe105b115bac9307c4326f745c 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -15,4 +15,6 @@ INSTALLFLAGS+=        -S 8k
 CPPFLAGS.memory.c+=    -I${MINIXSRCDIR}
 CPPFLAGS.imgrd.c+=     -I${.CURDIR}/../ramdisk -T /usr/tmp
 
+imgrd.o: ${.CURDIR}/../ramdisk/image.c
+
 .include <bsd.prog.mk>

diff --git a/tools/Makefile b/tools/Makefile
index ff40cc5d94d6e14919fb771f964fef71daeaaaac..982bdc441b62172f8619068968fa4c0b9fed6b25 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -49,9 +49,6 @@ image_mb: includes
        installboot -image $@ $(PROGRAMS)
        
 image:  includes services
-       cd ../kernel && $(MAKE)
-       cd ../servers && $(MAKE) all
-       cd ../drivers && $(MAKE) all
        padtext ../kernel/kernel kernel
        installboot -image $@ $(PROGRAMS)
 
@@ -62,9 +59,15 @@ includes:
 depend: includes
        $(MAKE) -C ../ depend
 
-services: includes 
+services: includes kernel servers .WAIT drivers
+
+kernel: includes
        $(MAKE) -C ../kernel 
+
+servers: includes
        $(MAKE) -C ../servers all install
+
+drivers: includes servers
        $(MAKE) -C ../drivers all install
 
 libraries: includes