X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fconfig.mk;h=1c5cb56897caf81eb9736cbaf0c705d54167ad01;hb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;hp=05899995d381c2ee7b6a440ed22814e20302827b;hpb=1f72adbc5322c4515f1fafc4e92653bc81055f3e;p=bertos.git

diff --git a/bertos/config.mk b/bertos/config.mk
index 05899995..1c5cb568 100644
--- a/bertos/config.mk
+++ b/bertos/config.mk
@@ -3,7 +3,7 @@
 # Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# Author: Bernardo Innocenti <bernie@develer.com>
+# Author: Bernie Innocenti <bernie@codewiz.org>
 # Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000
 #
 
@@ -13,11 +13,6 @@
 -include pgm_config.mk
 DPROG ?= -V -c stk500 -P /dev/ttyS0
 
-# Set to 1 to build for embedded devices.
-# e.g. produce target.elf instead of target and target_nostrip
-EMBEDDED_TARGET = 1
-#EMBEDDED_TARGET = 0
-
 OPTCFLAGS = -ffunction-sections -fdata-sections
 #OPTCFLAGS = -funsafe-loop-optimizations
 
@@ -58,7 +53,7 @@ COFFCONVERT=$(OBJCOPY) \
 	--change-section-address .noinit-0x800000 \
 	--change-section-address .eeprom-0x810000
 
-INCDIR  = -Ibertos 
+INCDIR  = -I. -Ibertos 
 LIBDIR  = lib
 OBJDIR  = obj
 OUTDIR  = images
@@ -74,11 +69,9 @@ DEP_FLAGS = -MMD -MP
 LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
 
 # Linker flags for generating map files
-ifeq ($(EMBEDDED_TARGET), 1)
-MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
-else
-MAP_FLAGS =
-endif
+# Only in embedded related projects generate map files
+MAP_FLAGS_EMB = -Wl,-Map=$(@:%.elf=%.map),--cref
+MAP_FLAGS_HOST =
 
 # Compiler warning flags for both C and C++
 WARNFLAGS = \
@@ -113,7 +106,7 @@ ASFLAGS	= $(DEBUGCFLAGS)
 #LDFLAGS = $(MAP_FLAGS)
 
 #bernie: does not complain for missing symbols!
-LDFLAGS = $(MAP_FLAGS) -Wl,--gc-sections
+LDFLAGS = -Wl,--gc-sections
 
 # Flags for avrdude
 AVRDUDEFLAGS = $(DPROG)