+2006-07-04 Borut Razem <borut.razem AT siol.net>
+
+ * 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 <bernhard AT bernhardheld.de>
* support/regression/valdiag/tests/switch.c,
* 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
# 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@
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
"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" ;;
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
LIBS = -lm @LIBS@
#CFLAGS += -Werror
-CPPFLAGS += -I$(srcdir) @CPPFLAGS@
+CPPFLAGS += -I$(srcdir)
ifdef SDCC_SUB_VERSION
CFLAGS += -DSDCC_SUB_VERSION_STR=\"$(SDCC_SUB_VERSION)\"
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk
# Make all in this directory
PORT = pic
-include ../port.mk
+include $(srcdir)/../port.mk
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk
--- /dev/null
+# Common Makefile for all ports.
+# Input: SOURCES - list of C files included in the project
+# SPECIAL - list of special files that should be included in dependencies
+# PEEPRULES - list of all peephole rules (.rul) derrived files
+# PREBUILD - list of special files to build before deps.
+
+# Ports are always located in sdcc/src/<portname>
+
+# Output
+LIB = port.a
+# Include the sdcc/src directory
+INCLUDEFLAGS = -I$(srcdir)/.. -I..
+
+# If the sources aren't specified, assume all in this directory.
+ifndef SOURCES
+SOURCES = $(notdir $(wildcard $(srcdir)/*.c))
+endif
+
+# If the peephole rules aren't specified, assume all.
+ifndef PEEPRULES
+PEEPDEFS = $(notdir $(wildcard $(srcdir)/*.def))
+PEEPRULES = $(PEEPDEFS:.def=.rul)
+endif
+
+PREBUILD += $(PEEPRULES)
+
+all: $(PREBUILD) dep $(LIB)
+
+include $(top_builddir)Makefile.common
+
+$(LIB): $(OBJ)
+ rm -f $(LIB)
+ $(AR) r $(LIB) $(OBJ)
+ $(RANLIB) $(LIB)
+
+%.rul: %.def
+ $(AWK) -f $(srcdir)/../SDCCpeeph.awk $< > $@
+
+dep: Makefile.dep
+
+Makefile.dep: $(PREBUILD) Makefile $(SOURCES) $(SPECIAL)
+ $(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) >Makefile.dep
+
+# don't include Makefile.dep for the listed targets:
+ifeq "$(findstring $(MAKECMDGOALS),clean distclean)" ""
+ include Makefile.dep
+endif
+
+include $(srcdir)/../port-clean.mk
+++ /dev/null
-# Common Makefile for all ports.
-# Input: SOURCES - list of C files included in the project
-# SPECIAL - list of special files that should be included in dependencies
-# PEEPRULES - list of all peephole rules (.rul) derrived files
-# PREBUILD - list of special files to build before deps.
-
-# Ports are always located in sdcc/src/<portname>
-
-CPPFLAGS += @CPPFLAGS@
-
-# Output
-LIB = port.a
-# Include the sdcc/src directory
-INCLUDEFLAGS = -I$(srcdir)/.. -I..
-
-# If the sources aren't specified, assume all in this directory.
-ifndef SOURCES
-SOURCES = $(notdir $(wildcard $(srcdir)/*.c))
-endif
-
-# If the peephole rules aren't specified, assume all.
-ifndef PEEPRULES
-PEEPDEFS = $(notdir $(wildcard $(srcdir)/*.def))
-PEEPRULES = $(PEEPDEFS:.def=.rul)
-endif
-
-PREBUILD += $(PEEPRULES)
-
-all: $(PREBUILD) dep $(LIB)
-
-include $(top_builddir)Makefile.common
-
-$(LIB): $(OBJ)
- rm -f $(LIB)
- $(AR) r $(LIB) $(OBJ)
- $(RANLIB) $(LIB)
-
-%.rul: %.def
- $(AWK) -f $(srcdir)/../SDCCpeeph.awk $< > $@
-
-dep: Makefile.dep
-
-Makefile.dep: $(PREBUILD) Makefile $(SOURCES) $(SPECIAL)
- $(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) >Makefile.dep
-
-# don't include Makefile.dep for the listed targets:
-ifeq "$(findstring $(MAKECMDGOALS),clean distclean)" ""
- include Makefile.dep
-endif
-
-include $(srcdir)/../port-clean.mk
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk
top_srcdir = @top_srcdir@
# Make all in this directory
-include ../port.mk
+include $(srcdir)/../port.mk