[paparazzi-commits] [5528] TARGET.CFLAGS were put twice for the depend rule .

[antoine drouin]

Revision: 5528
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5528
Author:   poine
Date:     2010-08-21 20:13:01 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
TARGET.CFLAGS were put twice for the depend rule . put back the default OPT=s 
for stm32

Modified Paths:
--------------
    paparazzi3/trunk/conf/Makefile.arm7
    paparazzi3/trunk/conf/Makefile.stm32

Modified: paparazzi3/trunk/conf/Makefile.arm7
===================================================================
--- paparazzi3/trunk/conf/Makefile.arm7 2010-08-21 19:56:38 UTC (rev 5527)
+++ paparazzi3/trunk/conf/Makefile.arm7 2010-08-21 20:13:01 UTC (rev 5528)
@@ -307,7 +307,7 @@
 $(OBJDIR)/.depend:
        @echo DEPEND $@
        @test -d $(OBJDIR) || mkdir -p $(OBJDIR)
-       $(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).CFLAGS) $($(TARGET).srcs) | sed 
's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
+       $(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).srcs) | sed 
's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),erase)

Modified: paparazzi3/trunk/conf/Makefile.stm32
===================================================================
--- paparazzi3/trunk/conf/Makefile.stm32        2010-08-21 19:56:38 UTC (rev 
5527)
+++ paparazzi3/trunk/conf/Makefile.stm32        2010-08-21 20:13:01 UTC (rev 
5528)
@@ -31,8 +31,8 @@
 
 MCU   = cortex-m3
 #DEBUG = dwarf-2
-#OPT   = s
-OPT   = 2
+OPT   = s
+#OPT   = 2
 #OPT   = 0
 
 # Programs location
@@ -254,7 +254,7 @@
 $(OBJDIR)/.depend:
        @echo DEPEND $@
        @test -d $(OBJDIR) || mkdir -p $(OBJDIR)
-       $(Q)$(CC) -MM -MG $(THUMB) $(CFLAGS) $($(TARGET).CFLAGS) 
$($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
+       $(Q)$(CC) -MM -MG $(THUMB) $(CFLAGS) $($(TARGET).srcs) | sed 
's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
 ifneq ($(MAKECMDGOALS),clean) 
 ifneq ($(MAKECMDGOALS),erase)