Parcourir la source

Fix recursive Makes from Atmel Studios on Win64
Apparently $(MAKE) expanding to something containing "(x86)" is bad!

WestfW il y a 6 ans
Parent
commit
5e0a6a0031

+ 7 - 7
optiboot/bootloaders/optiboot/Makefile

@@ -409,7 +409,7 @@ atmega8_isp: isp
 pro20: TARGET = pro_20mhz
 pro20: CHIP = atmega168
 pro20:
-	$(MAKE) atmega168 AVR_FREQ=20000000L LED_START_FLASHES=3
+	"$(MAKE)" atmega168 AVR_FREQ=20000000L LED_START_FLASHES=3
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -431,7 +431,7 @@ pro20_isp: isp
 pro16: TARGET = pro_16MHz
 pro16: CHIP = atmega168
 pro16:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED_START_FLASHES=3
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED_START_FLASHES=3
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -448,7 +448,7 @@ pro16_isp: isp
 diecimila: TARGET = diecimila
 diecimila: CHIP = atmega168
 diecimila:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED_START_FLASHES=3
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED_START_FLASHES=3
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -490,7 +490,7 @@ mega1280_isp: isp
 lilypad: TARGET = $@
 lilypad: CHIP = atmega168
 lilypad:
-	$(MAKE) $(CHIP) AVR_FREQ=8000000L LED_START_FLASHES=3
+	"$(MAKE)" $(CHIP) AVR_FREQ=8000000L LED_START_FLASHES=3
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -520,7 +520,7 @@ lilypad_resonator_isp: isp
 pro8: TARGET = pro_8MHz
 pro8: CHIP = atmega168
 pro8:
-	$(MAKE) $(CHIP) AVR_FREQ=8000000L LED_START_FLASHES=3
+	"$(MAKE)" $(CHIP) AVR_FREQ=8000000L LED_START_FLASHES=3
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -537,7 +537,7 @@ pro8_isp: isp
 atmega328_pro8: TARGET = atmega328_pro_8MHz
 atmega328_pro8: CHIP = atmega328
 atmega328_pro8:
-	$(MAKE) $(CHIP) AVR_FREQ=8000000L LED_START_FLASHES=3
+	"$(MAKE)" $(CHIP) AVR_FREQ=8000000L LED_START_FLASHES=3
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -574,7 +574,7 @@ baudcheck: FORCE
 	- @$(SH) baudcheck.tmp.sh
 
 isp: $(TARGET)
-	$(MAKE) -f Makefile.isp isp TARGET=$(TARGET)
+	"$(MAKE)" -f Makefile.isp isp TARGET=$(TARGET)
 
 isp-stk500: $(PROGRAM)_$(TARGET).hex
 	$(STK500-1)

+ 5 - 5
optiboot/bootloaders/optiboot/Makefile.1284

@@ -47,7 +47,7 @@ atmega1284_isp: isp
 sanguino: TARGET = $@
 sanguino: CHIP = atmega644p
 sanguino:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED=B0
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED=B0
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -65,7 +65,7 @@ sanguino_isp: isp
 mighty1284: TARGET = $@
 mighty1284: CHIP = atmega1284p
 mighty1284:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED=B7
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED=B7
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -83,7 +83,7 @@ mighty1284_isp: isp
 bobuino: TARGET = $@
 bobuino: CHIP = atmega1284p
 bobuino:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED=B7
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED=B7
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -105,7 +105,7 @@ bobuino_isp: isp
 wildfirev2: TARGET = $@
 wildfirev2: CHIP = atmega1284p
 wildfirev2:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED=B7 BAUD_RATE=1000000
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED=B7 BAUD_RATE=1000000
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
@@ -123,7 +123,7 @@ wildfirev2_isp: isp
 wildfirev3: TARGET = $@
 wildfirev3: CHIP = atmega1284p
 wildfirev3:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED=B5
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED=B5
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 

+ 1 - 1
optiboot/bootloaders/optiboot/Makefile.2560

@@ -37,7 +37,7 @@ atmega2560_isp: isp
 mega2560: TARGET = $@
 mega2560: CHIP = atmega2560
 mega2560:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 

+ 3 - 3
optiboot/bootloaders/optiboot/Makefile.atmel

@@ -15,20 +15,20 @@
 xplained168pb: TARGET = $@
 xplained168pb: CHIP = atmega168
 xplained168pb:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L BAUD_RATE=57600
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L BAUD_RATE=57600
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
 xplained328pb: TARGET = $@
 xplained328pb: CHIP = atmega328
 xplained328pb:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L BAUD_RATE=57600
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L BAUD_RATE=57600
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 
 xplained328p: TARGET = $@
 xplained328p: CHIP = atmega328
 xplained328p:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L BAUD_RATE=57600
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L BAUD_RATE=57600
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst

+ 1 - 1
optiboot/bootloaders/optiboot/Makefile.custom

@@ -9,7 +9,7 @@
 wildfire: TARGET = $@
 wildfire: CHIP = atmega1284p
 wildfire:
-	$(MAKE) $(CHIP) AVR_FREQ=16000000L LED=B5
+	"$(MAKE)" $(CHIP) AVR_FREQ=16000000L LED=B5
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst
 

+ 1 - 1
optiboot/bootloaders/optiboot/Makefile.extras

@@ -106,7 +106,7 @@ attiny84: $(PROGRAM)_attiny84.lst
 luminet: TARGET = $@
 luminet: CHIP = attiny84
 luminet:
-	$(MAKE) $(CHIP) AVR_FREQ=1000000L LED_START_FLASHES=0 BAUD_RATE=9600
+	"$(MAKE)" $(CHIP) AVR_FREQ=1000000L LED_START_FLASHES=0 BAUD_RATE=9600
 	mv $(PROGRAM)_$(CHIP).hex $(PROGRAM)_$(TARGET).hex
 	mv $(PROGRAM)_$(CHIP).lst $(PROGRAM)_$(TARGET).lst