.depend automaking fixed, ARCHDIR variable usage added

conf/Makefile.avr

@@ -27,6 +27,7 @@
 #
 
 OBJDIR = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/$(TARGETDIR)
+SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/avr
 
 CC		= $(ATMELBIN)/avr-gcc -mmcu=$(ARCH)
 LD		= $(CC) $(ATMEL_LIBPATH)
@@ -68,11 +69,11 @@ LDFLAGS		=	-lm						\
 # General rules
 #
 
-$(TARGET).objs	= $($(TARGET).srcs:%.c=$(OBJDIR)/%.o)	
+$(TARGET).srcsnd = $(notdir $($(TARGET).srcs))
+$(TARGET).objs	= $($(TARGET).srcsnd:%.c=$(OBJDIR)/%.o)	
 
 
 all compile: $($(TARGET).objs) $(OBJDIR)/$(TARGET).elf
-	echo $(OBJDIR)
 
 load upload: $(TARGET).install
 
@@ -117,7 +118,7 @@ $(OBJDIR)/%.s: %.c
 $(OBJDIR)/%.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: $(PAPARAZZI_SRC)/sw/airborne/avr/%.c
+$(OBJDIR)/%.o: $(SRC_ARCH)/%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(OBJDIR)/%.hex: $(OBJDIR)/%.elf

conf/airframes/twinstar1.xml

@@ -87,6 +87,7 @@
     <define name="PHI0" value="30" unit="deg"/>
   </section>
   <makefile>
+ARCHDIR=avr
 LOCAL_CFLAGS += -DDATALINK
 AP_EXTRA_SRCS += traffic_info.c datalink.c
 LOCAL_CFLAGS += -DWAVECARD

sw/airborne/autopilot/Makefile

@@ -48,18 +48,24 @@ INCLUDES = -I .. -I ../../include -I $(VARINCLUDE) -I $(ACINCLUDE) -I ../avr -I
 GPS = gps_ubx.c
 GPS_FLAGS=-DUBX
 
+ifndef ARCHDIR
+ARCHDIR=avr
+endif
+
+SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/$(ARCHDIR)
+
 $(TARGET).srcs	= \
 	main.c \
-	modem.c \
+	$(SRC_ARCH)/modem.c \
 	link_mcu.c \
-	link_mcu_ap.c \
-	spi_ap.c \
-	adc_ap.c \
+	$(SRC_ARCH)/link_mcu_ap.c \
+	$(SRC_ARCH)/spi_ap.c \
+	$(SRC_ARCH)/adc_ap.c \
 	$(GPS) \
 	infrared.c \
 	pid.c \
 	nav.c \
-	uart_ap.c \
+	$(SRC_ARCH)/uart_ap.c \
         estimator.c \
 	if_calib.c \
 	mainloop.c \

sw/airborne/fly_by_wire/Makefile

@@ -44,13 +44,15 @@ ifeq ($(CTL_BRD_VERSION),V1_2)
 CTL_BRD_FLAGS=-DCTL_BRD_V1_2
 endif
 
+SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/avr
+
 $(TARGET).srcs	=							\
 	main.c								\
-	ppm.c								\
-	servo.c								\
-	spi_fbw.c								\
-	uart_fbw.c                                                          \
-	adc_fbw.c                               \
+	$(SRC_ARCH)/ppm.c						\
+	$(SRC_ARCH)/servo.c						\
+	$(SRC_ARCH)/spi_fbw.c						\
+	$(SRC_ARCH)/uart_fbw.c                                          \
+	$(SRC_ARCH)/adc_fbw.c                               \
 
 
 include $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/Makefile.ac