Simplify the makefile configuration

Change-Id: I826916e0d0b23f7429a66dfa7001b19dcc53080a
This commit is contained in:
Romain Goyet
2017-02-16 10:55:46 +01:00
parent 9b6b341c62
commit a94e8c314f
9 changed files with 10 additions and 15 deletions

View File

@@ -1,12 +1,8 @@
# You can edit this file to change build settings
# You can override those settings on the command line
PLATFORM ?= device
VERBOSE ?= 0
DEBUG ?= 1
LIBA_LOG_DYNAMIC_MEMORY ?= 0
ESCHER_LOG_EVENTS ?= 0
ION_EVENTS ?= keyboard
# Possible values : keyboard, stdin, random, replay
# Do not edit below this

View File

@@ -1,9 +1,5 @@
SFLAGS += -Iescher/include
ifeq ($(ESCHER_LOG_EVENTS),1)
SFLAGS += -DESCHER_LOG_EVENTS=1
endif
objs += $(addprefix escher/src/,\
alternate_empty_view_controller.o\
app.o\

View File

@@ -4,7 +4,6 @@ include ion/src/$(PLATFORM)/Makefile
objs += $(addprefix ion/src/shared/, \
c.o \
events.o \
events_$(ION_EVENTS).o \
)
tests += $(addprefix ion/test/,\

View File

@@ -2,6 +2,7 @@ objs += $(addprefix ion/src/blackbox/, boot.o ion.o)
objs += $(addprefix ion/src/shared/, \
crc32.o \
events.o \
events_stdin.o \
log_printf.o \
power.o \
)

View File

@@ -1,5 +1,9 @@
include ion/src/device/boot/Makefile
objs += $(addprefix ion/src/shared/, \
events_keyboard.o \
)
objs += $(addprefix ion/src/device/, \
backlight.o \
battery.o\

View File

@@ -5,5 +5,6 @@ objs += $(addprefix ion/src/emscripten/, \
objs += $(addprefix ion/src/shared/, \
crc32.o \
events.o \
events_keyboard.o \
power.o \
)

View File

@@ -2,5 +2,6 @@
#include <stdio.h>
void Ion::Log::print(const char * message) {
printf("%s\n", message);
printf("%s", message);
fflush(stdout);
}

View File

@@ -9,6 +9,7 @@ objs += $(addprefix ion/src/simulator/keyboard/, fltkkbd.o)
objs += $(addprefix ion/src/shared/, \
crc32.o \
events_keyboard.o \
log_printf.o \
power.o \
)

View File

@@ -1,9 +1,5 @@
SFLAGS += -Iliba/include
ifeq ($(LIBA_LOG_DYNAMIC_MEMORY),1)
SFLAGS += -DLIBA_LOG_DYNAMIC_MEMORY=1
endif
liba/src/external/sqlite/mem5.o: CFLAGS += -w
objs += $(addprefix liba/src/, \