X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=config.mk;h=5ace0dbdf4c0f90ac29b5b1553ecadb5ca9090d4;hb=e5523f6098d2f4d51c838459ce83423152cc8692;hp=8c857e4372402a2cedffa1f4954ec1e2cbac0b3c;hpb=42cfb32d63a5a136a8d17594f0ded8102a35887c;p=bertos.git

diff --git a/config.mk b/config.mk
index 8c857e43..5ace0dbd 100644
--- a/config.mk
+++ b/config.mk
@@ -3,13 +3,8 @@
 # Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# Based on:
-#   GCC-AVR standard Makefile part 1
-#   Volker Oth 1/2000
-#
 # Author: Bernardo Innocenti <bernie@develer.com>
-#
-# $Log$
+# Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000
 #
 
 #
@@ -18,20 +13,6 @@
 -include pgm_config.mk
 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
-
-# JTAG ICE mkII
-#DPROG = avarice --mkII -j usb -l
-
-# PonyProg serial programmer
-#DPROG = -c dasa2
-
 # Set to 1 to build for embedded devices.
 # e.g. produce target.elf instead of target and target_nostrip
 EMBEDDED_TARGET = 1
@@ -54,6 +35,7 @@ CC      = gcc
 CXX     = g++
 AS      = $(CC) -x assembler-with-cpp
 LD      = $(CC)
+LDXX	= $(CXX)
 OBJCOPY = objcopy
 STRIP   = strip
 INSTALL = cp -a
@@ -65,6 +47,7 @@ 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.