projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add randpool test program.
[bertos.git]
/
config.mk
diff --git
a/config.mk
b/config.mk
index dd3128d3bd5f55b3edef79b24d42d8e157545f23..471d12b7901390313fbd5f340eac567c7647540f 100755
(executable)
--- a/
config.mk
+++ b/
config.mk
@@
-10,6
+10,12
@@
# Author: Bernardo Innocenti <bernie@develer.com>
#
# $Log$
# Author: Bernardo Innocenti <bernie@develer.com>
#
# $Log$
+# Revision 1.9 2006/09/20 14:28:42 marco
+# Add MOC. Changed OPTCFLAGS.
+#
+# Revision 1.8 2006/09/19 17:50:56 bernie
+# Make native build the default.
+#
# Revision 1.7 2006/07/19 12:56:24 bernie
# Convert to new Doxygen style.
#
# Revision 1.7 2006/07/19 12:56:24 bernie
# Convert to new Doxygen style.
#
@@
-35,6
+41,8
@@
#
# AVR ISP dongle that blows up easily
DPROG = -V -c stk500 -P /dev/ttyS0
#
# AVR ISP dongle that blows up easily
DPROG = -V -c stk500 -P /dev/ttyS0
+#DPROG = -V -c jtag2slow
+#-P /dev/ttyUSB0
# STK200 parallel cable
#DPROG = -c stk200 -E noreset
# STK200 parallel cable
#DPROG = -c stk200 -E noreset
@@
-45,7
+53,8
@@
DPROG = -V -c stk500 -P /dev/ttyS0
# PonyProg serial programmer
#DPROG = -c dasa2
# PonyProg serial programmer
#DPROG = -c dasa2
-OPTCFLAGS = -ffunction-sections -fdata-sections -funsafe-loop-optimizations
+#OPTCFLAGS = -ffunction-sections -fdata-sections -funsafe-loop-optimizations
+OPTCFLAGS = -funsafe-loop-optimizations
# For AVRStudio
#DEBUGCFLAGS = -gdwarf-2
# For AVRStudio
#DEBUGCFLAGS = -gdwarf-2
@@
-56,8
+65,10
@@
DEBUGCFLAGS = -ggdb
#
# define some variables based on the AVR base path in $(AVR)
#
#
# define some variables based on the AVR base path in $(AVR)
#
-CROSS = avr-
+CROSS =
+#CROSS = avr-
CC = $(CROSS)gcc
CC = $(CROSS)gcc
+CXX = $(CROSS)g++
AS = $(CC) -x assembler-with-cpp
LD = $(CC)
OBJCOPY = $(CROSS)objcopy
AS = $(CC) -x assembler-with-cpp
LD = $(CC)
OBJCOPY = $(CROSS)objcopy
@@
-66,6
+77,7
@@
RM = rm -f
RM_R = rm -rf
RN = mv
MKDIR_P = mkdir -p
RM_R = rm -rf
RN = mv
MKDIR_P = mkdir -p
+MOC = moc
# For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
COFFCONVERT=$(OBJCOPY) \
# For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
COFFCONVERT=$(OBJCOPY) \
@@
-96,7
+108,8
@@
DEP_FLAGS = -MMD -MP
LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
# Linker flags for generating map files
LIST_FLAGS = -Wa,-anhlmsd=$(@:.o=.lst)
# Linker flags for generating map files
-MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
+#bernie: bogus binutils from Fedora 6 can't cope with this
+#MAP_FLAGS = -Wl,-Map=$(@:%.elf=%.map),--cref
# Compiler warning flags for both C and C++
WARNFLAGS = \
# Compiler warning flags for both C and C++
WARNFLAGS = \
@@
-110,12
+123,15
@@
WARNFLAGS = \
C_WARNFLAGS = \
-Wmissing-prototypes -Wstrict-prototypes
C_WARNFLAGS = \
-Wmissing-prototypes -Wstrict-prototypes
+# Default C preprocessor flags (for C, C++ and cpp+as)
+CPPFLAGS = $(INCDIR)
+
# Default C compiler flags
# Default C compiler flags
-CFLAGS = $(
INCDIR) $(
OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) $(C_WARNFLAGS) \
+CFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) $(C_WARNFLAGS) \
$(DEP_FLAGS) $(LIST_FLAGS) -std=gnu99
# Default C++ compiler flags
$(DEP_FLAGS) $(LIST_FLAGS) -std=gnu99
# Default C++ compiler flags
-CXXFLAGS = $(
INCDIR) $(
OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) \
+CXXFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) \
$(DEP_FLAGS) $(LIST_FLAGS)
# Default compiler assembly flags
$(DEP_FLAGS) $(LIST_FLAGS)
# Default compiler assembly flags
@@
-125,7
+141,7
@@
CPPAFLAGS = $(DEBUGCFLAGS) -MMD
ASFLAGS = $(DEBUGCFLAGS)
# Default linker flags
ASFLAGS = $(DEBUGCFLAGS)
# Default linker flags
-
#
LDFLAGS = $(MAP_FLAGS)
+LDFLAGS = $(MAP_FLAGS)
#bernie: does not complain for missing symbols!
#LDFLAGS = $(MAP_FLAGS) -Wl,--gc-sections
#bernie: does not complain for missing symbols!
#LDFLAGS = $(MAP_FLAGS) -Wl,--gc-sections