Release script: Remove .d/.depend files from CD

diff --git a/Makefile b/Makefile
index dd6aacbce18469f5cdb7b7007590e1697f53a821..1296fe59d44c6f9c03d73adbd47503e69df22c76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -57,11 +57,11 @@ commands:
        cd commands && $(MAKE) all
 
 depend::
-       cd boot && $(MAKE) $@
-       cd commands && $(MAKE) $@
-       cd kernel && $(MAKE) $@
-       cd servers && $(MAKE) $@
-       cd drivers && $(MAKE) $@
+       cd boot && $(MAKE) depend
+       cd commands && $(MAKE) depend
+       cd kernel && $(MAKE) depend
+       cd servers && $(MAKE) depend
+       cd drivers && $(MAKE) depend
 
 etcfiles::
        cd etc && $(MAKE) install
@@ -70,24 +70,23 @@ all::
        cd boot && $(MAKE) all
        cd commands && $(MAKE) all
        cd tools && $(MAKE) all
-       cd servers && $(MAKE) all
-       cd drivers && $(MAKE) all
 
 install::
-       cd boot && $(MAKE) all install
-       cd man && $(MAKE) all install makedb
-       cd commands && $(MAKE) all install
-       cd share && $(MAKE) all install
-       cd tools && $(MAKE) all install
-       cd servers && $(MAKE) all install
-       cd drivers && $(MAKE) all install
+       cd boot && $(MAKE) install
+       cd man && $(MAKE) install makedb
+       cd commands && $(MAKE) install
+       cd share && $(MAKE) install
+       cd tools && $(MAKE) install
 
 clean::
        cd boot && $(MAKE) clean
        cd commands && $(MAKE) clean
        cd tools && $(MAKE) clean
-       cd servers && $(MAKE) clean
        cd lib && sh ack_build.sh clean
        cd lib && sh gnu_build.sh clean
-       cd commands && $(MAKE) clean
        cd test && $(MAKE) clean
+
+cleandepend::
+       cd boot && $(MAKE) cleandepend
+       cd commands && $(MAKE) cleandepend
+       cd tools && $(MAKE) cleandepend

diff --git a/etc/mk/minix.subdir.mk b/etc/mk/minix.subdir.mk
index 31cec4bbd4db0aa67c840ef6bc01d7b883f548ef..a4957b9f1b78bfbb96794c5c1fd9556eae3ff7cb 100644 (file)
--- a/etc/mk/minix.subdir.mk
+++ b/etc/mk/minix.subdir.mk
@@ -3,6 +3,11 @@
 
 .include <minix.init.mk>
 
+# MINIX: cleandepend works for SUBDIRs
+TARGETS+= cleandepend
+.PHONY: cleandepend
+.NOTMAIN: cleandepend
+
 .if !defined(NOSUBDIR)                                 # {
 
 .for dir in ${SUBDIR}

diff --git a/tools/Makefile b/tools/Makefile
index a53eec943e364f9876a0b2fa345f6ccccd74ac12..d2957b77c27ba0453d5c69765129efebb3e559e4 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,6 @@
 # Makefile for the kernel image.
 
 u=/usr
-CC=    exec cc
 CFLAGS=        -O -D_MINIX -D_POSIX_SOURCE
 MDEC=  /usr/mdec
 
@@ -45,7 +44,7 @@ usage:
 all: services image
 
 image:  includes
-       cd ../kernel && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS)
+       cd ../kernel && $(MAKE)
        cd ../servers && $(MAKE) all
        cd ../drivers && $(MAKE) all
        installboot -image $@ $(PROGRAMS)
@@ -59,8 +58,8 @@ depend: includes
 
 services: includes 
        cd ../kernel && $(MAKE) 
-       cd ../servers && $(MAKE) all install
-       cd ../drivers && $(MAKE) all install
+       cd ../servers && $(MAKE) install
+       cd ../drivers && $(MAKE) install
 
 libraries: includes
        cd ../lib && sh ack_build.sh clean obj depend all install
@@ -86,3 +85,7 @@ clean:
        cd ../drivers && $(MAKE) $@
        rm -rf *.bak image *.iso *.iso.gz cdfdimage rootimage src
 
+cleandepend::
+       cd ../kernel && $(MAKE) $@
+       cd ../servers && $(MAKE)  $@
+       cd ../drivers && $(MAKE)  $@

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index eedd4c27a00151dc9ed3bad0492308b411cf1e56..18ff1f9fbcb417269226ce61b87ac226bde68195 100755 (executable)
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -15,6 +15,8 @@ if [ $MAKEMAP -ne 0 ]; then
        find . -type f -perm 755 | xargs nm -n 2> /dev/null > symbols.txt
 fi
 make clean
+make cleandepend
+find . -name obj-ack -type d|xargs rm -rf
 # Let man find the manpages
 makewhatis /usr/man
 makewhatis /usr/local/man