From 8e59bbd8bbe6ea78f0d9bdd1fed4c5cb495ca6d8 Mon Sep 17 00:00:00 2001 From: borutr Date: Mon, 3 Jul 2006 10:11:18 +0000 Subject: [PATCH] sdcc-build: * local/ppc-osx3.mk: added * emu/rrz80/cpu/z80.h: detect __BIG_ENDIAN__ if defined by preprocessor sdcc: * src/configure.in, src/configure, src/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/hc08/Makefile.in, src/mcs51/Makefile.in, src/pic16/Makefile.in, src/pic/Makefile.in, src/xa51/Makefile.in, src/z80/Makefile.in: git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4256 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 8 ++++++++ configure | 10 ++++++---- configure.in | 1 + src/Makefile.in | 2 +- src/avr/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 => port.mk.in} | 2 ++ src/xa51/Makefile.in | 2 +- src/z80/Makefile.in | 2 +- 14 files changed, 27 insertions(+), 14 deletions(-) rename src/{port.mk => port.mk.in} (98%) diff --git a/ChangeLog b/ChangeLog index 0c80cdc4..cff59524 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-07-03 Borut Razem + + * src/configure.in, src/configure, src/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/hc08/Makefile.in, src/mcs51/Makefile.in, src/pic16/Makefile.in, + src/pic/Makefile.in, src/xa51/Makefile.in, src/z80/Makefile.in: + 2006-07-02 Raphael Neider * src/pic16/devices.inc, diff --git a/configure b/configure index 2aa7c97e..b4e337d4 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 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 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" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -8016,9 +8016,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -8488,6 +8489,7 @@ 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 993a3520..d1e44932 100755 --- a/configure.in +++ b/configure.in @@ -685,6 +685,7 @@ 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 6084aa72..72364261 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 += -I$(srcdir) @CPPFLAGS@ ifdef SDCC_SUB_VERSION CFLAGS += -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\" diff --git a/src/avr/Makefile.in b/src/avr/Makefile.in index dfb8a524..a0a932b7 100644 --- a/src/avr/Makefile.in +++ b/src/avr/Makefile.in @@ -4,4 +4,4 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Make all in this directory -include $(srcdir)/../port.mk +include ../port.mk diff --git a/src/ds390/Makefile.in b/src/ds390/Makefile.in index dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/ds400/Makefile.in b/src/ds400/Makefile.in index dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/hc08/Makefile.in b/src/hc08/Makefile.in index dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/mcs51/Makefile.in b/src/mcs51/Makefile.in index dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/pic/Makefile.in b/src/pic/Makefile.in index 8f8d493f..743a9332 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/pic16/Makefile.in b/src/pic16/Makefile.in index dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/port.mk b/src/port.mk.in similarity index 98% rename from src/port.mk rename to src/port.mk.in index 466a2eae..cc97e094 100644 --- a/src/port.mk +++ b/src/port.mk.in @@ -6,6 +6,8 @@ # 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 dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk diff --git a/src/z80/Makefile.in b/src/z80/Makefile.in index dfb8a524..a0a932b7 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 $(srcdir)/../port.mk +include ../port.mk -- 2.30.2