From 3a26d9dbc713222a50615792e6fddd6cc82f8507 Mon Sep 17 00:00:00 2001 From: Jesus Sanchez-Palencia Date: Fri, 20 Mar 2015 09:18:13 -0300 Subject: [PATCH] x86: Only add elfloader-x86.c to the platforms using it Currently there are only one platform using CPU x86: Cooja. The elfloader-x86.c is rather a POSIX implementation, so the Galileo port won't use it for now. This patch fixes this by moving this source file to be included by the platforms using it instead of the cpu's Makefile. --- cpu/x86/Makefile.x86 | 2 +- platform/cooja/Makefile.cooja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/x86/Makefile.x86 b/cpu/x86/Makefile.x86 index 0aececd4d..46ab27817 100644 --- a/cpu/x86/Makefile.x86 +++ b/cpu/x86/Makefile.x86 @@ -1,6 +1,6 @@ CONTIKI_CPU_DIRS = . -CONTIKI_SOURCEFILES += mtarch.c elfloader-x86.c +CONTIKI_SOURCEFILES += mtarch.c ### Compiler definitions CC = gcc diff --git a/platform/cooja/Makefile.cooja b/platform/cooja/Makefile.cooja index c28dac608..d10979cd9 100644 --- a/platform/cooja/Makefile.cooja +++ b/platform/cooja/Makefile.cooja @@ -47,7 +47,7 @@ CONTIKI_TARGET_DIRS = . dev lib sys cfs net # (COOJA_SOURCEDIRS contains additional sources dirs set from simulator) vpath %.c $(COOJA_SOURCEDIRS) -COOJA_BASE = simEnvChange.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c watchdog.c rimestats.c +COOJA_BASE = simEnvChange.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c watchdog.c rimestats.c elfloader-x86.c COOJA_INTFS = beep.c button-sensor.c ip.c leds-arch.c moteid.c \ pir-sensor.c rs232.c vib-sensor.c \