X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fconfig.mk;h=1d75dc0b48b3b4a603b92e21e3fe51d0449331e8;hb=4278d44ef7681c56f4bd16615c3c4d9338112df4;hp=cfe8ca6ea350c597bcc8c7e1f2f8c153017469f8;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/config.mk b/bertos/config.mk
index cfe8ca6e..1d75dc0b 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.
@@ -58,7 +50,7 @@ COFFCONVERT=$(OBJCOPY) \
 	--change-section-address .noinit-0x800000 \
 	--change-section-address .eeprom-0x810000
 
-INCDIR  = -I. -Ibertos -Ibertos/hw
+INCDIR  = -I. -Ibertos -Ibertos/net/lwip/src/include -Ibertos/net/lwip/src/include/ipv4
 LIBDIR  = lib
 OBJDIR  = obj
 OUTDIR  = images
@@ -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 = \
@@ -92,12 +82,14 @@ WARNFLAGS = \
 C_WARNFLAGS = \
 	-Wmissing-prototypes -Wstrict-prototypes
 
+C_COMPILER_STD = -std=gnu99
+
 # Default C preprocessor flags (for C, C++ and cpp+as)
 CPPFLAGS = $(INCDIR)
 
 # Default C compiler flags
 CFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) $(C_WARNFLAGS) \
-	$(DEP_FLAGS) $(LIST_FLAGS) -std=gnu99
+	$(DEP_FLAGS) $(LIST_FLAGS) $(C_COMPILER_STD)
 
 # Default C++ compiler flags
 CXXFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) \
@@ -113,10 +105,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