diff options
author | obrien <obrien@FreeBSD.org> | 2000-11-17 21:25:15 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-11-17 21:25:15 +0000 |
commit | eb7769fac61a5ec09afaaed99f45e5bb3c75bd83 (patch) | |
tree | 5eabb185642b21b0e4e9aab4f98bce58a93e6bdc /sys | |
parent | 3a97b3e213f232a4b939a68fed0d93230f4b2ddb (diff) | |
download | FreeBSD-src-eb7769fac61a5ec09afaaed99f45e5bb3c75bd83.zip FreeBSD-src-eb7769fac61a5ec09afaaed99f45e5bb3c75bd83.tar.gz |
Fix the `make -jX' (X>1) breakage.
Based on patch submitted by: Makoto MATSUSHITA <matusita@jp.freebsd.org>
Reviewed by: marcel, bde
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/Makefile.alpha | 20 | ||||
-rw-r--r-- | sys/conf/Makefile.i386 | 20 | ||||
-rw-r--r-- | sys/conf/Makefile.ia64 | 20 | ||||
-rw-r--r-- | sys/conf/Makefile.pc98 | 20 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 20 |
5 files changed, 55 insertions, 45 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index d045c07..3a8b051 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -252,7 +252,7 @@ links: echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ sort -u | comm -23 - dontlink | \ sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks - sh makelinks && rm -f dontlink + sh makelinks; rm -f dontlink kernel-tags: @[ -f .depend ] || { echo "you must make depend first"; exit 1; } @@ -310,29 +310,31 @@ MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} modules: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} all modules-depend: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} depend modules-clean: - cd $S/modules && env ${MKMODULESENV} ${MAKE} clean + cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean modules-cleandepend: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend modules-cleandir: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir modules-tags: - cd $S/modules && env ${MKMODULESENV} ${MAKE} tags + cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags modules-install modules-install.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install modules-reinstall modules-reinstall.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 369dd4d..512eaab 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -212,7 +212,7 @@ links: echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ sort -u | comm -23 - dontlink | \ sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks - sh makelinks && rm -f dontlink + sh makelinks; rm -f dontlink kernel-tags: @[ -f .depend ] || { echo "you must make depend first"; exit 1; } @@ -271,29 +271,31 @@ MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} modules: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} all modules-depend: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} depend modules-clean: - cd $S/modules && env ${MKMODULESENV} ${MAKE} clean + cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean modules-cleandepend: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend modules-cleandir: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir modules-tags: - cd $S/modules && env ${MKMODULESENV} ${MAKE} tags + cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags modules-install modules-install.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install modules-reinstall modules-reinstall.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64 index ebd1526..f114cde 100644 --- a/sys/conf/Makefile.ia64 +++ b/sys/conf/Makefile.ia64 @@ -217,7 +217,7 @@ links: echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ sort -u | comm -23 - dontlink | \ sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks - sh makelinks && rm -f dontlink + sh makelinks; rm -f dontlink kernel-tags: @[ -f .depend ] || { echo "you must make depend first"; exit 1; } @@ -275,29 +275,31 @@ MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} modules: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} all modules-depend: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} depend modules-clean: - cd $S/modules && env ${MKMODULESENV} ${MAKE} clean + cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean modules-cleandepend: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend modules-cleandir: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir modules-tags: - cd $S/modules && env ${MKMODULESENV} ${MAKE} tags + cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags modules-install modules-install.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install modules-reinstall modules-reinstall.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 7961d3a..f2bd145 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -215,7 +215,7 @@ links: echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ sort -u | comm -23 - dontlink | \ sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks - sh makelinks && rm -f dontlink + sh makelinks; rm -f dontlink kernel-tags: @[ -f .depend ] || { echo "you must make depend first"; exit 1; } @@ -274,29 +274,31 @@ MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} modules: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} all modules-depend: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} depend modules-clean: - cd $S/modules && env ${MKMODULESENV} ${MAKE} clean + cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean modules-cleandepend: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend modules-cleandir: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir modules-tags: - cd $S/modules && env ${MKMODULESENV} ${MAKE} tags + cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags modules-install modules-install.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install modules-reinstall modules-reinstall.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 369dd4d..512eaab 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -212,7 +212,7 @@ links: echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ sort -u | comm -23 - dontlink | \ sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks - sh makelinks && rm -f dontlink + sh makelinks; rm -f dontlink kernel-tags: @[ -f .depend ] || { echo "you must make depend first"; exit 1; } @@ -271,29 +271,31 @@ MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} modules: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} all modules-depend: @mkdir -p ${.OBJDIR}/modules - cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ + env ${MKMODULESENV} ${MAKE} depend modules-clean: - cd $S/modules && env ${MKMODULESENV} ${MAKE} clean + cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean modules-cleandepend: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend modules-cleandir: - cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir + cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir modules-tags: - cd $S/modules && env ${MKMODULESENV} ${MAKE} tags + cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags modules-install modules-install.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install modules-reinstall modules-reinstall.debug: - cd $S/modules && env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install config.o: ${NORMAL_C} |