X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fconfig.mk;h=752313a3eecec65ed1f16a9ed64dc102d10bb285;hb=911d2706a86d326786bfe721dcc3d63aeade7f28;hp=59997014c6af2d57097d6cdffbd586d66a972a07;hpb=a0f96b68de2f7966ee54afab7dd8252455560e38;p=bertos.git

diff --git a/bertos/config.mk b/bertos/config.mk
index 59997014..752313a3 100644
--- a/bertos/config.mk
+++ b/bertos/config.mk
@@ -3,20 +3,13 @@
 # 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
 #
 
 #
 # Programmer type
 # see local pgm_config.mk for programmer customization.
--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
@@ -30,9 +23,9 @@ DEBUGCFLAGS = -ggdb
 #
 # define some variables based on the AVR base path in $(AVR)
 #
-#CROSS   = avr-
 CC      = gcc
 CXX     = g++
+AR      = ar
 AS      = $(CC) -x assembler-with-cpp
 LD      = $(CC)
 LDXX	= $(CXX)
@@ -47,7 +40,6 @@ SHELL   = /bin/sh
 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.
@@ -71,14 +63,12 @@ FORMAT = srec
 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
-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,10 +103,13 @@ 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)
 
 # additional libs
 LIB = -lm
+
+# Archiver flags
+ARFLAGS = rcs