Makefiles: Updated for build on BSD

Remove reference to explicit 'make' and /bin/bash

Signed-off-by: Michel Pollet <[email protected]>

Author: buserror

Makefile

@@ -1,15 +1,15 @@
-all:	make-simavr make-tests make-examples
+all:	$(MAKE)-simavr $(MAKE)-tests $(MAKE)-examples
 
-make-simavr:
-	make -C simavr
+$(MAKE)-simavr:
+	$(MAKE) -C simavr
 
-make-tests: make-simavr
-	make -C tests
+$(MAKE)-tests: $(MAKE)-simavr
+	$(MAKE) -C tests
 
-make-examples: make-simavr
-	make -C examples
+$(MAKE)-examples: $(MAKE)-simavr
+	$(MAKE) -C examples
 
 clean:
-	make -C simavr clean
-	make -C tests clean
-	make -C examples clean
+	$(MAKE) -C simavr clean
+	$(MAKE) -C tests clean
+	$(MAKE) -C examples clean

Makefile.common

@@ -57,6 +57,7 @@ AR 			?= ar
 RANLIB 		?= ranlib
 MKDIR		?= mkdir -p
 INSTALL		?= install
+SHELL	 	:= ${shell which bash}
 
 # simavr directory
 SIMAVR		?= ${shell for p in . .. ../.. ../../..;do test -d $$p/simavr/sim && echo $$p/simavr; done}

examples/Makefile

@@ -8,8 +8,8 @@ boards=$(boards_base)
 endif
 
 all:
-	for bi in ${boards}; do make -C $$bi; done
+	for bi in ${boards}; do $(MAKE) -C $$bi; done
 
 clean:
-	for bi in ${boards}; do make -C $$bi clean; done
+	for bi in ${boards}; do $(MAKE) -C $$bi clean; done
 

examples/board_hd77480/Makefile

@@ -21,8 +21,6 @@ firm_src = ${wildcard at*${board}.c}
 firmware = ${firm_src:.c=.axf}
 simavr = ../../
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += ../parts
 IPATH += ${simavr}/include

examples/board_i2ctest/Makefile

@@ -21,8 +21,6 @@ firm_src = ${wildcard at*${board}.c}
 firmware = ${firm_src:.c=.axf}
 simavr = ../..
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += ${simavr}/examples/shared
 IPATH += ${simavr}/examples/parts

examples/board_ledramp/Makefile

@@ -21,8 +21,6 @@ firm_src = ${wildcard at*${board}.c}
 firmware = ${firm_src:.c=.axf}
 simavr = ../../
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += ../parts
 IPATH += ${simavr}/include

examples/board_reprap/Makefile

@@ -21,8 +21,6 @@ firm_src = ${wildcard atmega*.c}
 firmware = ${firm_src:.c=.hex}
 simavr = ../../
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += src
 IPATH += ../parts

examples/board_simduino/Makefile

@@ -21,8 +21,6 @@ firm_src = ${wildcard atmega*.c}
 firmware = ${firm_src:.c=.hex}
 simavr = ../../
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += ../parts
 IPATH += ${simavr}/include

examples/board_timer_64led/Makefile

@@ -21,8 +21,6 @@ firm_src = ${wildcard at*${target}.c}
 firmware = ${firm_src:.c=.axf}
 simavr = ../../
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += ../parts
 IPATH += ${simavr}/include

examples/board_usb/Makefile

@@ -21,8 +21,6 @@ firm_src = at90usb162_cdc_loopback.c
 firmware = ${firm_src:.c=.hex}
 simavr = ../../
 
-SHELL	 = /bin/bash
-
 IPATH = .
 IPATH += ../parts
 IPATH += ../vhci/include
@@ -47,14 +45,14 @@ ${board} : ${OBJ}/${target}.o
 
 ../vhci/lib/libusb_vhci.a:
 	@echo -n "BUILDIN $@ "
-	@{ make -j -C ../vhci >/tmp/vhci.build.log 2>&1 || \
+	@{ $(MAKE) -j -C ../vhci >/tmp/vhci.build.log 2>&1 || \
 		{ echo "ERROR check /tmp/vhci.build.log"; exit 1; }; } && \
 			echo " Done" 
 
 vhci : ../vhci/lib/libusb_vhci.a 
 
 clean-vhci:
-	make -C ../vhci clean
+	$(MAKE) -C ../vhci clean
 
 ${target}: vhci ${board}
 	@echo $@ done

examples/vhci/Makefile

@@ -18,7 +18,7 @@ all: library
 module: vhci-hcd-$(HCD_V)/usb-vhci-hcd.ko
 
 vhci-hcd-$(HCD_V)/usb-vhci-hcd.ko: vhci-hcd-$(HCD_V)
-	make -C vhci-hcd-$(HCD_V) \
+	$(MAKE) -C vhci-hcd-$(HCD_V) \
 		KDIR=/lib/modules/${shell uname -r}/build \
 		CORE_INCLUDE_DIR=$(PWD)/vhci-hcd-$(HCD_V)/linux/2.6.32/drivers/usb/core
 
@@ -37,7 +37,7 @@ lib/libusb_vhci.a: module libusb_vhci-$(VHCI_V)
 	ln -snf vhci-hcd-$(HCD_V) linux && \
 		cd libusb_vhci-$(VHCI_V) && \
 		./configure --prefix=$(PWD) CPPFLAGS="-I$(PWD)" --enable-static --disable-shared && \
-			make -j && make install
+			$(MAKE) -j && $(MAKE) install
 
 libusb_vhci-$(VHCI_V).tar.bz2:
 	wget $(BASE_URL)/native%20libraries/libusb_vhci-$(VHCI_V).tar.bz2

simavr/Makefile

@@ -18,7 +18,6 @@
 
 SIMAVR_VERSION	= 1.0a10
 SIMAVR_REVISION	= 1
-SHELL=/bin/bash
 
 target	= run_avr
 

tests/Makefile

@@ -20,9 +20,6 @@
 #	You should have received a copy of the GNU General Public License
 #	along with simavr.  If not, see <http://www.gnu.org/licenses/>.
 
-
-SHELL	 	= /bin/bash
-
 sources		:= $(wildcard at*.c)
 simavr 		= ..