Merge pull request #171 from SirWumpus/port_make_calls
Fix additional portable `make(1)` references.
This commit is contained in:
2 files changed
+10
-10
No files matched your search
+9
-9
@@ -23,7 +23,7 @@ clear
|
|||||||
|
|
||||||
# determine of make support -j2
|
# determine of make support -j2
|
||||||
#
|
#
|
||||||
make -j 2 prog.c >/dev/null 2>&1 < /dev/null
|
${MAKE} -j 2 prog.c >/dev/null 2>&1 < /dev/null
|
||||||
status="$?"
|
status="$?"
|
||||||
if [[ $status -ne 0 ]]; then
|
if [[ $status -ne 0 ]]; then
|
||||||
JOBS="1"
|
JOBS="1"
|
||||||
@@ -73,9 +73,9 @@ echo 1>&2
|
|||||||
rm -f "$SIZE.ppm"
|
rm -f "$SIZE.ppm"
|
||||||
rm -rf pixel
|
rm -rf pixel
|
||||||
if [[ $JOBS -ge 2 ]]; then
|
if [[ $JOBS -ge 2 ]]; then
|
||||||
time make -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
||||||
else
|
else
|
||||||
time make out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} out.ppm H="$SIZE" W="$SIZE"
|
||||||
fi
|
fi
|
||||||
mv -f -v out.ppm "$SIZE.ppm"
|
mv -f -v out.ppm "$SIZE.ppm"
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
@@ -103,9 +103,9 @@ echo 1>&2
|
|||||||
rm -f "$SIZE.ppm"
|
rm -f "$SIZE.ppm"
|
||||||
rm -rf pixel
|
rm -rf pixel
|
||||||
if [[ $JOBS -ge 2 ]]; then
|
if [[ $JOBS -ge 2 ]]; then
|
||||||
time make -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
||||||
else
|
else
|
||||||
time make out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} out.ppm H="$SIZE" W="$SIZE"
|
||||||
fi
|
fi
|
||||||
mv -f -v out.ppm "$SIZE.ppm"
|
mv -f -v out.ppm "$SIZE.ppm"
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
@@ -133,9 +133,9 @@ echo 1>&2
|
|||||||
rm -f "$SIZE.ppm"
|
rm -f "$SIZE.ppm"
|
||||||
rm -rf pixel
|
rm -rf pixel
|
||||||
if [[ $JOBS -ge 2 ]]; then
|
if [[ $JOBS -ge 2 ]]; then
|
||||||
time make -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
||||||
else
|
else
|
||||||
time make out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} out.ppm H="$SIZE" W="$SIZE"
|
||||||
fi
|
fi
|
||||||
mv -f -v out.ppm "$SIZE.ppm"
|
mv -f -v out.ppm "$SIZE.ppm"
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
@@ -157,9 +157,9 @@ echo 1>&2
|
|||||||
rm -f "$SIZE.ppm"
|
rm -f "$SIZE.ppm"
|
||||||
rm -rf pixel
|
rm -rf pixel
|
||||||
if [[ $JOBS -ge 2 ]]; then
|
if [[ $JOBS -ge 2 ]]; then
|
||||||
time make -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} -j "$JOBS" out.ppm H="$SIZE" W="$SIZE"
|
||||||
else
|
else
|
||||||
time make out.ppm H="$SIZE" W="$SIZE"
|
time ${MAKE} out.ppm H="$SIZE" W="$SIZE"
|
||||||
fi
|
fi
|
||||||
mv -f -v out.ppm "$SIZE.ppm"
|
mv -f -v out.ppm "$SIZE.ppm"
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ echo 1>&2
|
|||||||
read -r -n 1 -p "Press any key to run: make foo: "
|
read -r -n 1 -p "Press any key to run: make foo: "
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
make foo
|
${MAKE} foo
|
||||||
echo 1>&2
|
echo 1>&2
|
||||||
|
|
||||||
read -r -n 1 -p "Press any key to run: ./foo +foo.c > bar.c: "
|
read -r -n 1 -p "Press any key to run: ./foo +foo.c > bar.c: "
|
||||||
|
|||||||
Reference in new issue
Block a user