From 2fd1f188038f19ba3a6c3092be2b80e660f59c96 Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Tue, 1 Jun 2010 14:44:36 +0000 Subject: [PATCH] Release script: Remove .d/.depend files from CD --- Makefile | 31 +++++++++++++++---------------- etc/mk/minix.subdir.mk | 5 +++++ tools/Makefile | 11 +++++++---- tools/chrootmake.sh | 2 ++ 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index dd6aacbce..1296fe59d 100644 --- 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 31cec4bbd..a4957b9f1 100644 --- a/etc/mk/minix.subdir.mk +++ b/etc/mk/minix.subdir.mk @@ -3,6 +3,11 @@ .include +# 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 a53eec943..d2957b77c 100644 --- 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 eedd4c27a..18ff1f9fb 100755 --- 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 -- 2.44.0