Have the Windows batch files check for make

diff --git a/Makefile b/Makefile
index 2c95cc1455bda572066b0bf669606749ec9046d4..458ad7ab0053afccb4a2aea3afa8d7190053622e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,12 @@ all clean: %:
        $(MAKE) -C armsrc $@
        $(MAKE) -C $(HOST_BINARY) $@
 
        $(MAKE) -C armsrc $@
        $(MAKE) -C $(HOST_BINARY) $@
 

-.PHONY: all clean help
+.PHONY: all clean help _test

 help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
        @echo + all   - Make bootrom, armsrc and the OS-specific host directory 
        @echo + clean - Clean in bootrom, armsrc and the OS-specific host directory
 help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
        @echo + all   - Make bootrom, armsrc and the OS-specific host directory 
        @echo + clean - Clean in bootrom, armsrc and the OS-specific host directory

-       
\ No newline at end of file
+
+# Dummy target to test for GNU make availability
+_test:

diff --git a/cockpit/1makearm.bat b/cockpit/1makearm.bat
index d925fd3c6512f56eed3579ccb8b5638ae8d9fdbc..8efdd55614e2106780036a8a18532d48aa41605b 100644 (file)
--- a/cockpit/1makearm.bat
+++ b/cockpit/1makearm.bat
@@ -1,5 +1,8 @@
 @echo off\r
 @echo off\r

+call _checkmake\r
+IF %MAKE_FAILED%==1 GOTO end\r

 cd ..\armsrc\r
 rem make clean\r
 make\r
 cd ..\cockpit\r
 cd ..\armsrc\r
 rem make clean\r
 make\r
 cd ..\cockpit\r

+:end\r

diff --git a/cockpit/2makeboot.bat b/cockpit/2makeboot.bat
index 4258d9bb3641aadbb925dacc01164ed498722a79..aa8161e9dacb015d91b7ffac8a668be429301938 100644 (file)
--- a/cockpit/2makeboot.bat
+++ b/cockpit/2makeboot.bat
@@ -1,5 +1,8 @@
 @echo off\r
 @echo off\r

+call _checkmake\r
+IF %MAKE_FAILED%==1 GOTO end\r

 cd ..\bootrom\r
 rem make clean\r
 make\r
 cd ..\cockpit\r
 cd ..\bootrom\r
 rem make clean\r
 make\r
 cd ..\cockpit\r

+:end\r

diff --git a/cockpit/_checkmake.bat b/cockpit/_checkmake.bat
new file mode 100644 (file)
index 0000000..fabb72e
--- /dev/null
+++ b/cockpit/_checkmake.bat
@@ -0,0 +1,14 @@
+@echo off\r
+make -C .. -s _test\r
+IF ERRORLEVEL 1 GOTO fail\r
+SET MAKE_FAILED=0\r
+GOTO end\r
+:fail\r
+echo ************************************************\r
+echo * A compatible (GNU) make was not detected     *\r
+echo * Please get an updated version of the Windows *\r
+echo * compile environment, or install GNU make     *\r
+echo * manually                                     *\r
+echo ************************************************\r
+SET MAKE_FAILED=1\r
+:end\r