From a78608ec862b06c9f50029415fabb4a269f6e5fb Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Thu, 26 Aug 2010 19:54:49 +0000 Subject: [PATCH] Fix dependency problems in the build --- drivers/memory/Makefile | 2 ++ tools/Makefile | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 78efeff19..fa9089452 100644 --- 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 diff --git a/tools/Makefile b/tools/Makefile index ff40cc5d9..982bdc441 100644 --- 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