X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=config.mk;h=471d12b7901390313fbd5f340eac567c7647540f;hb=64ee2791e4733039450a64188c0cc43ef314af80;hp=27c0e82289983e18d31319d398a0f816ab845dd2;hpb=304ab6d368e046801f9c6bab326bbb27f78cb875;p=bertos.git

diff --git a/config.mk b/config.mk
index 27c0e822..471d12b7 100755
--- a/config.mk
+++ b/config.mk
@@ -10,8 +10,17 @@
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
 # $Log$
-# Revision 1.5  2006/06/12 21:37:01  marco
-# implemented some commands (ver and sleep)
+# 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.6  2006/06/12 22:05:09  marco
+# Bring back config wrongly commited
 #
 # Revision 1.4  2006/05/27 22:41:46  bernie
 # Tweak optimization flags for loops.
@@ -31,12 +40,16 @@
 # Programmer type
 #
 # AVR ISP dongle that blows up easily
-DPROG = -V -c jtag2slow
+DPROG = -V -c stk500 -P /dev/ttyS0
+#DPROG = -V -c jtag2slow
 #-P /dev/ttyUSB0
 
 # STK200 parallel cable
 #DPROG = -c stk200 -E noreset
 
+# JTAG ICE mkII
+#DPROG = avarice --mkII -j usb -l
+
 # PonyProg serial programmer
 #DPROG = -c dasa2
 
@@ -52,8 +65,10 @@ DEBUGCFLAGS = -ggdb
 #
 # define some variables based on the AVR base path in $(AVR)
 #
-CROSS   = avr-
+CROSS   =
+#CROSS   = avr-
 CC      = $(CROSS)gcc
+CXX     = $(CROSS)g++
 AS      = $(CC) -x assembler-with-cpp
 LD      = $(CC)
 OBJCOPY = $(CROSS)objcopy
@@ -62,6 +77,7 @@ RM      = rm -f
 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) \
@@ -92,7 +108,8 @@ DEP_FLAGS = -MMD -MP
 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 = \
@@ -106,12 +123,15 @@ WARNFLAGS = \
 C_WARNFLAGS = \
 	-Wmissing-prototypes -Wstrict-prototypes
 
+# Default C preprocessor flags (for C, C++ and cpp+as)
+CPPFLAGS = $(INCDIR)
+
 # 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
-CXXFLAGS = $(INCDIR) $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) \
+CXXFLAGS = $(OPTCFLAGS) $(DEBUGCFLAGS) $(WARNFLAGS) \
 	$(DEP_FLAGS) $(LIST_FLAGS)
 
 # Default compiler assembly flags