use a variable instead of an explicit call to make

Signed-off-by: Jafar Al-Gharaibeh <[email protected]>

plugins/src/Makefile

@@ -45,19 +45,19 @@ macos: $(PCMN) $(PMOS)
 
 # Build cross platforms plugins
 $(PCMN): $(LIBD)/uso.u
-	make -C $@
+	$(MAKE) -C $@
 
 # Build Windows plugins
 $(PWIN): $(LIBD)/uso.u
-	make -C $@
+	$(MAKE) -C $@
 
 # Build *nix plugins
 $(PNIX): $(LIBD)/uso.u
-	make -C $@
+	$(MAKE) -C $@
 
 # Build Mac OS plugins
 $(PMOS): $(LIBD)/uso.u
-	make -C $@
+	$(MAKE) -C $@
 
 # Unicon interface
 $(LIBD)/%.u:	%.icn $(CSRC)

tests/Makedefs

@@ -1,5 +1,4 @@
 SHELL=/bin/sh
-MAKE=make
 
 E=/bin/echo
 

tests/Makefile

@@ -15,21 +15,21 @@ Test: Hdr
 	@for dir in $(TESTS); do \
 	$(MAKE) -C $$dir; \
 	done
-	@make -s Summary
+	@$(MAKE) -s Summary
 
 all: Hdr
 	@for dir in $(TESTS); do \
 	$(MAKE) -C $$dir all; \
 	done
-	@make -s Summary
+	@$(MAKE) -s Summary
 
 Hdr:
 	@echo
 	@echo "   ====================================="
 	@echo "           Unicon Test Suite"
 	@$E -n "    "
 	@$(UC) -version
-	@echo "   ====================================="	
+	@echo "   ====================================="
 	@echo
 
 Summary: Hdr summary
@@ -43,7 +43,7 @@ Report:  Hdr
 	@for dir in $(TESTS); do \
 	$(MAKE) -C $$dir Report; \
 	done
-	@make -s Summary
+	@$(MAKE) -s Summary
 	@echo "====================================="
 	@echo " This Unicon Build:"
 	@$(UC) -features
@@ -54,7 +54,7 @@ UNAME=$(shell uname )
 RNAME=unicon-$(UNAME)-$(ARCH).report
 
 publish:
-	make -s Report > $(RNAME)
+	$(MAKE) -s Report > $(RNAME)
 	scp $(RNAME) web.sf.net:/home/project-web/unicon/htdocs/test/auto/
 
 Test-icont:	; cd general; $(MAKE) Test; cd ../posix; $(MAKE) Test

tests/Makefile.test

@@ -2,7 +2,7 @@
 
 # Do the tests
 DoTest: clean TestHdr $(TARGETS)
-	@make -s Summary
+	@$(MAKE) -s Summary
 
 %.u: %.icn
 	@$(UC) $(UFLAGS) $<
@@ -77,7 +77,7 @@ ICNFILES=$(patsubst %.diff,%.icn,$(wildcard *.diff))
 %.report: %.diff %.icn
 	@echo "++++++++++++++++++++++++++++"
 	@echo " *** Test: $(filter-out $<,$^) ***"
-	@echo 
+	@echo
 	@echo "----- Expected Output ---------------------------------------- Actual Output -----"
 	@cat $<
 	@echo
@@ -86,7 +86,7 @@ TestHdr:
 	@echo
 	@echo "========================="
 	@echo "   $(TESTNAME) Test Suite"
-	@echo "========================="	
+	@echo "========================="
 	@echo
 
 Summary:

tests/coexpr/Makefile

@@ -6,31 +6,31 @@ include ../Makedefs
 ifdef Verbose
 TEE=tee
 else
-TEE=cat - > 
+TEE=cat - >
 endif
 
-# 
+#
 # for verbose progress, run as:
-# make verbose
-# or 
-# Verbose=1 make -e [target ...]
+# $(MAKE) verbose
+# or
+# Verbose=1 $(MAKE) -e [target ...]
 #
 
 DIFFTST = moveco co
-GREPTST = cobench 
-GREPODTST = stressCo 
+GREPTST = cobench
+GREPODTST = stressCo
 GREPDIFFTST = stressCollectCo
 #TARGETS=$(patsubst %.icn,%,$(wildcard *.icn))
 #IGNORE=$(COTST)
-# ^ skipped. 
+# ^ skipped.
 TARGETS= $(DIFFTST) $(GREPTST) $(GREPODTST) $(GREPDIFFTST)
 
 # Do the tests
 Test: DoTest
 
-Uniconc : 
-	SKIP=moveco Verbose=1 UC="$(UCC)" make -e Test
-#  moveco does coexpr(), not supported by iconc yet, skip. 
+Uniconc :
+	SKIP=moveco Verbose=1 UC="$(UCC)" $(MAKE) -e Test
+#  moveco does coexpr(), not supported by iconc yet, skip.
 
 
 ${GREPTST} : % : %.icn local stand/%.std
@@ -54,7 +54,7 @@ ${GREPDIFFTST} : % : %.icn local stand/%.std stand/%.grep
 	grep -f stand/$@.grep local/$@.out | diff -wy stand/$@.std - > $@.diff; \
 	fi || true
 	-@rm -f $@$(EXE)
-# This will pass if all lines of .out with ANY part matching any line in .grep match .std 
+# This will pass if all lines of .out with ANY part matching any line in .grep match .std
 
 ${GREPODTST} : % : %.icn local stand/%.std stand/%.grep
 	-@$E -n "[Testing $@]... "
@@ -66,21 +66,21 @@ ${GREPODTST} : % : %.icn local stand/%.std stand/%.grep
 	grep -o -f stand/$@.grep local/$@.out | diff -wy stand/$@.std - > $@.diff; \
 	fi || true
 	-@rm -f $@$(EXE)
-# This will pass if all parts of lines of .out  matching any line in .grep match .std 
+# This will pass if all parts of lines of .out  matching any line in .grep match .std
 
 
 include ../Makefile.test
 
 #icont Icont Test-icont :
 #	SKIP=stressCollectCo IC=$(BIN)/icont sh Test-icon $(COTST)
 
-icont Icont : 
-	SKIP=stressCollectCo UC="$(BIN)/icont" make -e Test
+icont Icont :
+	SKIP=stressCollectCo UC="$(BIN)/icont" $(MAKE) -e Test
 
-iconc Iconc : 
-	SKIP="moveco stressCollectCo" Verbose=1 UC="$(BIN)/iconc" make -e Test
-#  moveco does coexpr(), not supported by iconc yet, skip. 
+iconc Iconc :
+	SKIP="moveco stressCollectCo" Verbose=1 UC="$(BIN)/iconc" $(MAKE) -e Test
+#  moveco does coexpr(), not supported by iconc yet, skip.
 
-Verbose verbose: 
+Verbose verbose:
 	Verbose=1 $(MAKE) -e