* device/lib/pic16/Makefile.common.in,

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

diff --git a/device/lib/pic/Makefile.common.in b/device/lib/pic/Makefile.common.in
index 1ba999ea44cbf6b711aba6ed940d47f27edb87ae..3ed9dc2806e9c8ff54ac2b198746fd83c59d1f8c 100644 (file)
--- a/device/lib/pic/Makefile.common.in
+++ b/device/lib/pic/Makefile.common.in
@@ -1,10 +1,10 @@
 ###########################################################
 ### Makefile.common.in for the SDCC/PIC14 Library
 ###
-### Copyright (C) 2005 by Raphael Neider <rneider@web.de>
+### Copyright (C) 2005 by Raphael Neider <rneider AT web.de>
 ###
 ### The library 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 GPL for details.
@@ -12,8 +12,6 @@
 ### $Id$
 ###
 
-SHELL = bash
-
 #################################################
 ### verboseness
 #Q     ?=              # be verbose
@@ -23,12 +21,13 @@ Q   ?= @            # be quiet
 
 #################################################
 ### compiler switches
-ARCH   ?= 877          # might be overwritten in libio
+# ARCH might be overwritten in libio
+ARCH   ?= 877
 
 CFLAGS ?=
 CFLAGS += -mpic14 -p16f$(ARCH)
 CFLAGS += --std-c99
-CFLAGS += -I. -I$(topsrcdir)/../../include/pic
+CFLAGS += -I. -I$(top_srcdir)/../../include/pic
 
 #################################################
 ### optimization flags
@@ -54,7 +53,8 @@ CFLAGS += --i-code-in-asm
 ### assembler switches
 ASFLAGS ?=
 ASFLAGS += -pp16f$(ARCH)
-ASFLAGS += -I$(topsrcdir)/../../include/pic
+ASFLAGS += -I$(top_srcdir)/../../include/pic
+ASFLAGS += -I. -I$(srcdir)
 
 #################################################
 ### linker switches
@@ -68,8 +68,8 @@ LIBFLAGS += -c
 
 #################################################
 ### programs to use
-CPP    = $(topsrcdir)/../../../bin/sdcpp
-CC     = $(topsrcdir)/../../../bin/sdcc
+CPP    = $(top_builddir)/../../../bin/sdcpp
+CC     = $(top_builddir)/../../../bin/sdcc
 AS     = @GPASM@
 LD     = @GPLINK@
 LIB    = @GPLIB@