Adding missing dependency on libraries for hdboot

 * Also cleanup a bit the makefile.
 * Also removing small inconsistency for arm builds where log would be
   skipped if doing a make hdboot, but not when cross-compiling.

Change-Id: Ic9e20655234a667ea8a967d05589d4df46c2d521

diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm
index 1903024437b38456344bba5fa128b1fbd6ddf490..8b9113f1ca5c4acc0f48cd3daee68b0ce98018d9 100644 (file)
--- a/distrib/sets/lists/minix/md.evbarm
+++ b/distrib/sets/lists/minix/md.evbarm
@@ -1,13 +1,15 @@
-./boot/minix/.temp/mod07_tty           minix-sys
-./boot/minix/.temp/mod08_mfs           minix-sys
-./boot/minix/.temp/mod09_vm            minix-sys
-./boot/minix/.temp/mod10_pfs           minix-sys
-./boot/minix/.temp/mod11_init          minix-sys
-./multiboot/mod07_tty                  minix-sys
-./multiboot/mod08_mfs                  minix-sys
-./multiboot/mod09_vm                   minix-sys
-./multiboot/mod10_pfs                  minix-sys
-./multiboot/mod11_init                 minix-sys
+./boot/minix/.temp/mod07_log           minix-sys
+./boot/minix/.temp/mod08_tty           minix-sys
+./boot/minix/.temp/mod09_mfs           minix-sys
+./boot/minix/.temp/mod10_vm            minix-sys
+./boot/minix/.temp/mod11_pfs           minix-sys
+./boot/minix/.temp/mod12_init          minix-sys
+./multiboot/mod07_log                  minix-sys
+./multiboot/mod08_tty                  minix-sys
+./multiboot/mod09_mfs                  minix-sys
+./multiboot/mod10_vm                   minix-sys
+./multiboot/mod11_pfs                  minix-sys
+./multiboot/mod12_init                 minix-sys
 ./usr/include/arm/aeabi.h              minix-sys
 ./usr/include/arm/ansi.h               minix-sys
 ./usr/include/arm/arm26                        minix-sys

diff --git a/releasetools/Makefile b/releasetools/Makefile
index 062e3251a0cf697aea8f7b5cf4d3736cc50c08e7..429caa327bbf131ef9fda2e66b033946a7e325f7 100644 (file)
--- a/releasetools/Makefile
+++ b/releasetools/Makefile
@@ -24,9 +24,7 @@ PROGRAMS+= ${PROGROOT}/servers/pm/pm
 PROGRAMS+= ${PROGROOT}/servers/sched/sched
 PROGRAMS+= ${PROGROOT}/servers/vfs/vfs
 PROGRAMS+= ${PROGROOT}/drivers/memory/memory
-.if ${MACHINE_ARCH} == "i386"
 PROGRAMS+= ${PROGROOT}/drivers/log/log
-.endif
 PROGRAMS+= ${PROGROOT}/drivers/tty/tty
 PROGRAMS+= ${PROGROOT}/servers/mfs/mfs
 PROGRAMS+= ${PROGROOT}/servers/vm/vm
@@ -51,37 +49,39 @@ usage:
        @echo " " >&2
        @echo "To create a fresh MINIX configuration, try:" >&2
        @echo " make clean install      # new boot image" >&2
-       @echo " make fresh install      # new everything" >&2
        @echo " " >&2
 
 all: services
 
 # rebuild the program or system libraries
 includes:
-       $(MAKE) -C ../ includes
+       ${MAKE} -C ../ includes
+
+libraries: includes
+       ${MAKE} -C ../ do-lib
 
 depend: includes .gitignore
-       $(MAKE) -C ../ depend
+       ${MAKE} -C ../ depend
 
-.gitignore: Makefile
-       echo $(GEN_FILES) | tr ' ' '\n' >.gitignore
+kernel: libraries
+       ${MAKE} -C ../kernel 
 
-services: includes kernel servers .WAIT drivers
+servers: libraries
+       ${MAKE} -C ../servers all install
 
-kernel: includes
-       $(MAKE) -C ../kernel 
+drivers: libraries servers
+       ${MAKE} -C ../drivers all install
 
-servers: includes
-       $(MAKE) -C ../servers all install
+services: kernel servers drivers
 
-drivers: includes servers
-       $(MAKE) -C ../drivers all install
+.gitignore: Makefile
+       echo ${GEN_FILES} | tr ' ' '\n' >.gitignore
 
 # make bootable and place system images
 bootable:
        exec su root mkboot bootable ${DESTDIR}
 
-hdboot: services .WAIT do-hdboot
+hdboot install: services .WAIT do-hdboot
 
 do-hdboot: 
        @rm -rf ${DESTDIR}/boot/minix/.temp/
@@ -106,9 +106,6 @@ do-hdboot:
        ${INSTALL} ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot;  \
        fi
 
-install:
-       ${MAKE} includes services hdboot
-
 # download and update NetBSD reference sources.
 nbsd_fetch:
        export CVS_RSH=ssh;                                                     \
@@ -135,12 +132,14 @@ nbsd_diff:
 
 # clean up compile results
 clean:
-       $(MAKE) -C ../kernel $@
-       $(MAKE) -C ../servers $@
-       $(MAKE) -C ../drivers $@
-       rm -rf $(GEN_FILES)
-
-cleandepend::
-       $(MAKE) -C ../kernel $@
-       $(MAKE) -C ../servers  $@
-       $(MAKE) -C ../drivers  $@
+       ${MAKE} -C ../lib $@
+       ${MAKE} -C ../kernel $@
+       ${MAKE} -C ../servers $@
+       ${MAKE} -C ../drivers $@
+       rm -rf ${GEN_FILES}
+
+cleandir:
+       ${MAKE} -C ../lib $@
+       ${MAKE} -C ../kernel $@
+       ${MAKE} -C ../servers $@
+       ${MAKE} -C ../drivers $@