From 043c22a94f39d137aaa14e5b54ec2a3e076580c9 Mon Sep 17 00:00:00 2001 From: borutr Date: Tue, 4 Jul 2006 07:29:55 +0000 Subject: [PATCH] * src/configure.in, src/configure, src/Makefile.in, as/z80/Makefile.in, src/port.mk, src/avr/Makefile.in, src/ds390/Makefile.in, src/ds400/Makefile.in, src/hc08/Makefile.in, src/mcs51/Makefile.in, src/pic16/Makefile.in, src/pic/Makefile.in, src/xa51/Makefile.in, src/z80/Makefile.in: reverted changes from 2006-07-03 * Makefile.common.in: added @CPPFLAGS@ to CPPFLAGS git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4263 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 12 +++++++++++- Makefile.common.in | 2 +- configure | 3 +-- configure.in | 1 - src/Makefile.in | 2 +- src/ds390/Makefile.in | 2 +- src/ds400/Makefile.in | 2 +- src/hc08/Makefile.in | 2 +- src/mcs51/Makefile.in | 2 +- src/pic/Makefile.in | 2 +- src/pic16/Makefile.in | 2 +- src/{port.mk.in => port.mk} | 2 -- src/xa51/Makefile.in | 2 +- src/z80/Makefile.in | 2 +- 14 files changed, 22 insertions(+), 16 deletions(-) rename src/{port.mk.in => port.mk} (98%) diff --git a/ChangeLog b/ChangeLog index 60e2bc8d..f3b8d87a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-07-04 Borut Razem + + * src/configure.in, src/configure, src/Makefile.in, as/z80/Makefile.in, + src/port.mk, + src/avr/Makefile.in, src/ds390/Makefile.in, src/ds400/Makefile.in, + src/hc08/Makefile.in, src/mcs51/Makefile.in, src/pic16/Makefile.in, + src/pic/Makefile.in, src/xa51/Makefile.in, src/z80/Makefile.in: + reverted changes from 2006-07-03 + * Makefile.common.in: added @CPPFLAGS@ to CPPFLAGS + 2006-07-03 Bernhard Held * support/regression/valdiag/tests/switch.c, @@ -11,7 +21,7 @@ * src/configure.in, src/configure, src/Makefile.in, as/z80/Makefile.in: defined CPPFLAGS * src/port.mk: defined CPPFLAGS, renamed to src/port.mk.in - * src/avr/Makefile.in, rc/ds390/Makefile.in, src/ds400/Makefile.in, + * src/avr/Makefile.in, src/ds390/Makefile.in, src/ds400/Makefile.in, src/hc08/Makefile.in, src/mcs51/Makefile.in, src/pic16/Makefile.in, src/pic/Makefile.in, src/xa51/Makefile.in, src/z80/Makefile.in: include ../port.mk diff --git a/Makefile.common.in b/Makefile.common.in index 5f73360c..343c8ad4 100644 --- a/Makefile.common.in +++ b/Makefile.common.in @@ -59,7 +59,7 @@ transform = @program_transform_name@ # Flags DEFS += $(subs -DHAVE_CONFIG_H,,@DEFS@) -CPPFLAGS += $(INCLUDEFLAGS) -I. -I$(top_builddir) -I$(srcdir)/$(SLIB) -I$(srcdir) +CPPFLAGS += @CPPFLAGS@ $(INCLUDEFLAGS) -I. -I$(top_builddir) -I$(srcdir)/$(SLIB) -I$(srcdir) CFLAGS += -Wall @CFLAGS@ LDFLAGS += @LDFLAGS@ M_OR_MM = @M_OR_MM@ diff --git a/configure b/configure index b4e337d4..3076501c 100755 --- a/configure +++ b/configure @@ -7932,7 +7932,7 @@ fi test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile" - ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile src/port.mk:src/port.mk.in device/include/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile Makefile Makefile.common:Makefile.common.in" + ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile Makefile Makefile.common:Makefile.common.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -8489,7 +8489,6 @@ do "device/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;; "main.mk" ) CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/port.mk" ) CONFIG_FILES="$CONFIG_FILES src/port.mk:src/port.mk.in" ;; "device/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES device/include/Makefile" ;; "support/librarian/Makefile" ) CONFIG_FILES="$CONFIG_FILES support/librarian/Makefile" ;; "support/makebin/Makefile" ) CONFIG_FILES="$CONFIG_FILES support/makebin/Makefile" ;; diff --git a/configure.in b/configure.in index d1e44932..993a3520 100755 --- a/configure.in +++ b/configure.in @@ -685,7 +685,6 @@ test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile]) AC_CONFIG_FILES([main.mk:main_in.mk src/Makefile -src/port.mk:src/port.mk.in device/include/Makefile support/librarian/Makefile support/makebin/Makefile diff --git a/src/Makefile.in b/src/Makefile.in index 72364261..6084aa72 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -18,7 +18,7 @@ PORT_LIBS = $(PORTS:%=%/port.a) LIBS = -lm @LIBS@ #CFLAGS += -Werror -CPPFLAGS += -I$(srcdir) @CPPFLAGS@ +CPPFLAGS += -I$(srcdir) ifdef SDCC_SUB_VERSION CFLAGS += -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\" diff --git a/src/ds390/Makefile.in b/src/ds390/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/ds390/Makefile.in +++ b/src/ds390/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/ds400/Makefile.in b/src/ds400/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/ds400/Makefile.in +++ b/src/ds400/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/hc08/Makefile.in b/src/hc08/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/hc08/Makefile.in +++ b/src/hc08/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/mcs51/Makefile.in b/src/mcs51/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/mcs51/Makefile.in +++ b/src/mcs51/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/pic/Makefile.in b/src/pic/Makefile.in index 743a9332..8f8d493f 100644 --- a/src/pic/Makefile.in +++ b/src/pic/Makefile.in @@ -6,4 +6,4 @@ top_srcdir = @top_srcdir@ # Make all in this directory PORT = pic -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/pic16/Makefile.in b/src/pic16/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/pic16/Makefile.in +++ b/src/pic16/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/port.mk.in b/src/port.mk similarity index 98% rename from src/port.mk.in rename to src/port.mk index cc97e094..466a2eae 100644 --- a/src/port.mk.in +++ b/src/port.mk @@ -6,8 +6,6 @@ # Ports are always located in sdcc/src/ -CPPFLAGS += @CPPFLAGS@ - # Output LIB = port.a # Include the sdcc/src directory diff --git a/src/xa51/Makefile.in b/src/xa51/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/xa51/Makefile.in +++ b/src/xa51/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk diff --git a/src/z80/Makefile.in b/src/z80/Makefile.in index a0a932b7..dfb8a524 100644 --- a/src/z80/Makefile.in +++ b/src/z80/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include ../port.mk +include $(srcdir)/../port.mk -- 2.30.2