d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the `make -jX' (X>1) breakage.

Browse Source 
Based on patch submitted by:	Makoto MATSUSHITA <matusita@jp.freebsd.org>
Reviewed by:	marcel, bde
This commit is contained in:
obrien 2000-11-17 21:25:15 +00:00
parent 87763ac61f
commit 67b277d61a
5 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/conf/Makefile.alpha
View File

@ -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}

20
sys/conf/Makefile.i386
View File

@ -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}

20
sys/conf/Makefile.ia64
View File

@ -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}

20
sys/conf/Makefile.pc98
View File

@ -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}

20
sys/conf/Makefile.powerpc
View File

@ -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}