[paparazzi-commits] [5853] Makefile echo problem

[Christophe De Wagter]

Revision: 5853
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5853
Author:   dewagter
Date:     2010-09-13 21:51:10 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
Makefile echo problem

Modified Paths:
--------------
    paparazzi3/trunk/Makefile.ac
    paparazzi3/trunk/conf/autopilot/fixedwing.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4017.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_ppm.makefile

Modified: paparazzi3/trunk/Makefile.ac
===================================================================
--- paparazzi3/trunk/Makefile.ac        2010-09-13 20:46:47 UTC (rev 5852)
+++ paparazzi3/trunk/Makefile.ac        2010-09-13 21:51:10 UTC (rev 5853)
@@ -65,10 +65,16 @@
 demo:
        $(SUPERVISION)
 
+ifeq ($(MAKECMDGOALS),all_ac_h) 
+-include $(MAKEFILE_AC)
+endif
+
+
+
 all_ac_h: $(AIRFRAME_H) $(MODULES_H) $(SETTINGS_H) $(TUNING_H) $(MAKEFILE_AC) 
$(PERIODIC_H)
-       @echo -e "TARGET: $(TARGET)\n" > $(ACINCLUDE)/$(TARGET)_srcs.list
-       @echo -e "CFLAGS: $($(TARGET).CFLAGS)\n\n" >> 
$(ACINCLUDE)/$(TARGET)_srcs.list
-       @echo "srcs:  $($(TARGET).srcs)" >> $(ACINCLUDE)/$(TARGET)_srcs.list
+       @echo "TARGET: " $(TARGET) "\n" > $(ACINCLUDE)/$(TARGET)_srcs.list
+       @echo "CFLAGS: " $($(TARGET).CFLAGS) "\n"  >> 
$(ACINCLUDE)/$(TARGET)_srcs.list
+       @echo "srcs: " $($(TARGET).srcs) >> $(ACINCLUDE)/$(TARGET)_srcs.list
 
 radio_ac_h : $(RADIO_H) $(CONF_RADIO_CONTROL_PPM_H)
 
@@ -94,10 +100,6 @@
        $(Q)mv /tmp/conf_radio_control_ppm.h $@
        $(Q)cp $< $(AIRCRAFT_CONF_DIR)/radios
 
-ifeq ($(MAKECMDGOALS),all_ac_h) 
--include $(MAKEFILE_AC)
-endif
-
 $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) 
$(CONF)/$(TELEMETRY) $(MAKEFILE_AC)
        @echo BUILD $@
        $(Q)$(TOOLS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) 
$(CONF)/$(TELEMETRY) $(PERIODIC_FREQ) > $@

Modified: paparazzi3/trunk/conf/autopilot/fixedwing.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing.makefile  2010-09-13 20:46:47 UTC 
(rev 5852)
+++ paparazzi3/trunk/conf/autopilot/fixedwing.makefile  2010-09-13 21:51:10 UTC 
(rev 5853)
@@ -9,7 +9,7 @@
 
 
 SRC_FIXEDWING=.
-SRC_FIXEDWING_ARCH=$(SRC_FIXEDWING)/$(ARCH)
+SRC_ARCH=$(SRC_FIXEDWING)/$(ARCH)
 SRC_FIXEDWING_TEST=$(SRC_FIXEDWING)/
 
 FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4017.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4017.makefile    
    2010-09-13 20:46:47 UTC (rev 5852)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4017.makefile    
    2010-09-13 21:51:10 UTC (rev 5853)
@@ -1,5 +1,5 @@
 # for Tiny v2 or Twog v1
 
 ap.CFLAGS += -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017
-ap.srcs += $(SRC_FIXEDWING_ARCH)/servos_4017_hw.c $(SRC_FIXEDWING)/actuators.c
+ap.srcs += $(SRC_ARCH)/servos_4017_hw.c $(SRC_FIXEDWING)/actuators.c
 

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_ppm.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_ppm.makefile 
2010-09-13 20:46:47 UTC (rev 5852)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_ppm.makefile 
2010-09-13 21:51:10 UTC (rev 5853)
@@ -6,5 +6,5 @@
 # can be adjusted in the "servos_ppm_hw.h" file to suit your particular 
receiver.
 
 ap.CFLAGS += -DACTUATORS=\"servos_ppm_hw.h\" -DSERVOS_PPM_MAT
-ap.srcs += $(SRC_FIXEDWING_ARCH)/servos_ppm_hw.c $(SRC_FIXEDWING)/actuators.c
+ap.srcs += $(SRC_ARCH)/servos_ppm_hw.c $(SRC_FIXEDWING)/actuators.c