* src/pic/device.c (sanitise_processor_name): only remove p(ic) prefix,

[fw/sdcc] / device / lib / pic16 / Makefile.common.in

diff --git a/device/lib/pic16/Makefile.common.in b/device/lib/pic16/Makefile.common.in
index 2c787dfd70d087b357461e159a700ee0e63be43e..1d41e3808a424f8d11b305ea99e95e882f171898 100644 (file)
--- a/device/lib/pic16/Makefile.common.in
+++ b/device/lib/pic16/Makefile.common.in
@@ -1,14 +1,14 @@
 ###########################################################
 ### Makefile.common.in for the GNU PIC Library
 ###
-### Copyright (C) 2005 by Raphael Neider <rneider@web.de>
+### Copyright (C) 2005 by Raphael Neider <rneider AT web.de>
 ###
 ### The GNU PIC Library was originally designed and
 ### implemented by
 ###    Vangelis Rokas <vrokas@otenet.gr>
 ###
 ### It is currently maintained by
-###    Raphael Neider <rneider@web.de>
+###    Raphael Neider <rneider AT web.de>
 ###
 ### This file may be distributed under the terms of the the
 ### GNU General Public License (GPL). See COPYING for details.
@@ -16,6 +16,8 @@
 ### $Id$
 ###
 
+SHELL = bash
+
 #################################################
 ### verboseness
 #Q     ?=              # be verbose
@@ -30,7 +32,7 @@ ARCH   ?= 452         # might be overwritten in libio
 CFLAGS ?=
 CFLAGS += -mpic16 -p18f$(ARCH)
 CFLAGS += --std-c99
-CFLAGS += -I. -I$(topsrcdir)/../../include/pic16
+CFLAGS += -I. -I$(top_srcdir)/../../include/pic16
 
 #################################################
 ### optimization flags
@@ -62,7 +64,8 @@ CFLAGS += --i-code-in-asm
 ### assembler switches
 ASFLAGS ?=
 ASFLAGS += -pp18f$(ARCH)
-ASFLAGS += -I$(topsrcdir)/../../include/pic16
+ASFLAGS += -I$(top_srcdir)/../../include/pic16
+ASFLAGS += -I$(srcdir)
 
 #################################################
 ### linker switches
@@ -76,8 +79,8 @@ LIBFLAGS += -c
 
 #################################################
 ### programs to use
-CPP    = $(topsrcdir)/../../../bin/sdcpp
-CC     = $(topsrcdir)/../../../bin/sdcc
+CPP    = $(top_builddir)../../../bin/sdcpp
+CC     = $(top_builddir)../../../bin/sdcc --asm=@GPASM@
 AS     = @GPASM@
 LD     = @GPLINK@
 LIB    = @GPLIB@