projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the new parsing functions and a sample file for test it
[bertos.git]
/
bertos
/
config.mk
diff --git
a/bertos/config.mk
b/bertos/config.mk
index 59997014c6af2d57097d6cdffbd586d66a972a07..67e4dbd080d2b1ce8b1d34cce039685765514500 100644
(file)
--- 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.
#
# Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
# All rights reserved.
#
-# Author: Bern
ardo Innocenti <bernie@develer.com
>
+# Author: Bern
ie Innocenti <bernie@codewiz.org
>
# Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000
#
# 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
-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
OPTCFLAGS = -ffunction-sections -fdata-sections
#OPTCFLAGS = -funsafe-loop-optimizations
@@
-33,6
+28,7
@@
DEBUGCFLAGS = -ggdb
#CROSS = avr-
CC = gcc
CXX = g++
#CROSS = avr-
CC = gcc
CXX = g++
+AR = ar
AS = $(CC) -x assembler-with-cpp
LD = $(CC)
LDXX = $(CXX)
AS = $(CC) -x assembler-with-cpp
LD = $(CC)
LDXX = $(CXX)
@@
-47,7
+43,6
@@
SHELL = /bin/sh
CHECKER = sparse
DOXYGEN = doxygen
AVRDUDE = avrdude
CHECKER = sparse
DOXYGEN = doxygen
AVRDUDE = avrdude
-MOC = moc-qt4
FLEXCAT = $(top_srcdir)/tools/flexcat/flexcat
# For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
FLEXCAT = $(top_srcdir)/tools/flexcat/flexcat
# For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
@@
-71,14
+66,12
@@
FORMAT = srec
DEP_FLAGS = -MMD -MP
# Compiler flags for generating source listings
DEP_FLAGS = -MMD -MP
# Compiler flags for generating source listings
-LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
+LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
-dp
# Linker flags for generating map files
# 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 = \
# Compiler warning flags for both C and C++
WARNFLAGS = \
@@
-113,10
+106,13
@@
ASFLAGS = $(DEBUGCFLAGS)
#LDFLAGS = $(MAP_FLAGS)
#bernie: does not complain for missing symbols!
#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)
# additional libs
LIB = -lm
# Flags for avrdude
AVRDUDEFLAGS = $(DPROG)
# additional libs
LIB = -lm
+
+# Archiver flags
+ARFLAGS = rcs