[paparazzi-commits] [4729] Makefile updates

[Allen Ibara]

Revision: 4729
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4729
Author:   aibara
Date:     2010-03-25 06:59:11 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
Makefile updates

Modified Paths:
--------------
    paparazzi3/trunk/conf/Makefile.arm7
    paparazzi3/trunk/conf/Makefile.pentium-m
    paparazzi3/trunk/sw/airborne/arm7/lpcusb/Makefile

Modified: paparazzi3/trunk/conf/Makefile.arm7
===================================================================
--- paparazzi3/trunk/conf/Makefile.arm7 2010-03-25 06:57:57 UTC (rev 4728)
+++ paparazzi3/trunk/conf/Makefile.arm7 2010-03-25 06:59:11 UTC (rev 4729)
@@ -29,6 +29,8 @@
 SRC_ARCH = arm7
 
 # Define programs and commands.
+HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc)
+ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),)
 CC             = arm-elf-gcc
 LD             = $(CC)
 SHELL = sh
@@ -36,6 +38,15 @@
 OBJDUMP = arm-elf-objdump
 SIZE = arm-elf-size
 NM = arm-elf-nm
+else
+CC             = arm-none-eabi-gcc
+LD             = $(CC)
+SHELL = sh
+OBJCOPY = arm-none-eabi-objcopy
+OBJDUMP = arm-none-eabi-objdump
+SIZE = arm-none-eabi-size
+NM = arm-none-eabi-nm
+endif
 REMOVE = rm -f
 COPY = cp
 

Modified: paparazzi3/trunk/conf/Makefile.pentium-m
===================================================================
--- paparazzi3/trunk/conf/Makefile.pentium-m    2010-03-25 06:57:57 UTC (rev 
4728)
+++ paparazzi3/trunk/conf/Makefile.pentium-m    2010-03-25 06:59:11 UTC (rev 
4729)
@@ -74,7 +74,13 @@
 
 # Program the device.  
 load upload program: $(OBJDIR)/$(TARGET).elf
+ifdef USER
+       ssh $(USER)@$(HOST) "sudo mount -o remount,rw /"
        scp $(OBJDIR)/$(TARGET).elf $(USER)@$(HOST):$(TARGET_DIR)
+else
+       ssh $(HOST) "sudo mount -o remount,rw /"
+       scp $(OBJDIR)/$(TARGET).elf $(HOST):$(TARGET_DIR)
+endif
 
 # Link: create ELF output file from object files.
 .SECONDARY : $(OBJDIR)/$(TARGET).elf

Modified: paparazzi3/trunk/sw/airborne/arm7/lpcusb/Makefile
===================================================================
--- paparazzi3/trunk/sw/airborne/arm7/lpcusb/Makefile   2010-03-25 06:57:57 UTC 
(rev 4728)
+++ paparazzi3/trunk/sw/airborne/arm7/lpcusb/Makefile   2010-03-25 06:59:11 UTC 
(rev 4729)
@@ -5,12 +5,24 @@
 DATE           = $$(date +%Y%m%d)
 
 # Tool definitions
+HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc)
+
+ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),)
 CC      = arm-elf-gcc
 LD      = arm-elf-ld -v
 AR      = arm-elf-ar
 AS      = arm-elf-as
 CP      = arm-elf-objcopy
-OD             = arm-elf-objdump
+OD     = arm-elf-objdump
+else
+CC=arm-none-eabi-gcc
+LD=arm-none-eabi-ld -v
+AR=arm-none-eabi-ar
+AS=arm-none-eabi-ar
+CP=arm-none-eabi-objcopy
+OD=arm-none-eabi-objdump
+endif
+
 RM             = rm
 TAR            = tar