Commit aa380a8d authored by Geert Stappers's avatar Geert Stappers

Import Upstream version 2.5.99+2.6.0rc1

parent 39b40522

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -29,7 +29,7 @@ sdcc: ...@@ -29,7 +29,7 @@ sdcc:
cd .. cd ..
packihx: packihx:
cd packihx cd support\packihx
make -f Makefile.bcc make -f Makefile.bcc
cd .. cd ..
......
...@@ -28,7 +28,6 @@ mandir = @mandir@ ...@@ -28,7 +28,6 @@ mandir = @mandir@
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
man2dir = $(mandir)/man2 man2dir = $(mandir)/man2
infodir = @infodir@ infodir = @infodir@
srcdir = @srcdir@
docdir = @docdir@ docdir = @docdir@
DESTDIR = DESTDIR =
...@@ -36,11 +35,23 @@ include_dir_suffix = @include_dir_suffix@ ...@@ -36,11 +35,23 @@ include_dir_suffix = @include_dir_suffix@
lib_dir_suffix = @lib_dir_suffix@ lib_dir_suffix = @lib_dir_suffix@
# Modules to enable/disable # Modules to enable/disable
OPT_ENABLE_UCSIM = @OPT_ENABLE_UCSIM@ OPT_DISABLE_AVR = @OPT_DISABLE_AVR@
OPT_ENABLE_DEVICE_LIB_BUILD = @OPT_ENABLE_DEVICE_LIB_BUILD@ OPT_DISABLE_DS390 = @OPT_DISABLE_DS390@
OPT_ENABLE_PACKIHX = @OPT_ENABLE_PACKIHX@ OPT_DISABLE_DS400 = @OPT_DISABLE_DS400@
OPT_DISABLE_HC08 = @OPT_DISABLE_HC08@
OPT_DISABLE_MCS51 = @OPT_DISABLE_MCS51@
OPT_DISABLE_PIC = @OPT_DISABLE_PIC@
OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
OPT_DISABLE_XA51 = @OPT_DISABLE_XA51@
OPT_DISABLE_Z80 = @OPT_DISABLE_Z80@
SLIB = $(PRJDIR)/support/Util OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@
OPT_DISABLE_DEVICE_LIB= @OPT_DISABLE_DEVICE_LIB@
OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@
OPT_ENABLE_DOC = @OPT_ENABLE_DOC@
OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@
SLIB = $(top_builddir)support/Util
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
transform = @program_transform_name@ transform = @program_transform_name@
...@@ -48,7 +59,7 @@ transform = @program_transform_name@ ...@@ -48,7 +59,7 @@ transform = @program_transform_name@
# Flags # Flags
DEFS += $(subs -DHAVE_CONFIG_H,,@DEFS@) DEFS += $(subs -DHAVE_CONFIG_H,,@DEFS@)
CPPFLAGS += $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB) CPPFLAGS += @CPPFLAGS@ $(INCLUDEFLAGS) -I. -I$(top_builddir) -I$(srcdir)/$(SLIB) -I$(srcdir)
CFLAGS += -Wall @CFLAGS@ CFLAGS += -Wall @CFLAGS@
LDFLAGS += @LDFLAGS@ LDFLAGS += @LDFLAGS@
M_OR_MM = @M_OR_MM@ M_OR_MM = @M_OR_MM@
......
...@@ -4,42 +4,64 @@ ...@@ -4,42 +4,64 @@
SHELL = /bin/sh SHELL = /bin/sh
PRJDIR = . VPATH = @srcdir@
srcdir = @srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
include $(PRJDIR)/Makefile.common include Makefile.common
SDCC_MISC = debugger/mcs51 sim/ucsim SDCC_LIBS = support/makebin
SDCC_LIBS = support/cpp2 support/makebin
SDCC_DOC = doc SDCC_DOC = doc
# Parts that are not normally compiled but need to be cleaned # Parts that are not normally compiled but need to be cleaned
SDCC_EXTRA = support/regression SDCC_EXTRA = support/regression
SDCC_ASLINK = as/mcs51 as link as/hc08 SDCC_PACKIHX = support/packihx
SDCC_PACKIHX = packihx
SDCC_LIBRARIAN = support/librarian SDCC_LIBRARIAN = support/librarian
TARGETS = sdcc-libs sdcc-cc sdcc-aslink sdcc-doc ifeq ($(OPT_DISABLE_HC08), 0)
SDCC_ASLINK += as/hc08
endif
ifeq ($(OPT_DISABLE_MCS51), 0)
SDCC_ASLINK += as/mcs51
SDCC_MISC += debugger/mcs51
endif
PKGS = $(SDCC_LIBS) src $(SDCC_ASLINK) $(SDCC_DOC) ifeq ($(OPT_DISABLE_Z80), 0)
SDCC_ASLINK += as link
endif
ifneq ($(OPT_ENABLE_UCSIM), no) ifeq ($(OPT_DISABLE_UCSIM), 0)
TARGETS += sdcc-misc TARGETS += sdcc-misc
SDCC_MISC += sim/ucsim
PKGS += $(SDCC_MISC) PKGS += $(SDCC_MISC)
endif endif
ifneq ($(OPT_ENABLE_DEVICE_LIB_BUILD), no) ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
TARGETS += sdcc-device TARGETS += sdcc-device-lib
PKGS += device/include device/lib PKGS += device/lib
endif endif
ifneq ($(OPT_ENABLE_PACKIHX), no) ifeq ($(OPT_DISABLE_PACKIHX), 0)
TARGETS += sdcc-packihx TARGETS += sdcc-packihx
PKGS += $(SDCC_PACKIHX) PKGS += $(SDCC_PACKIHX)
endif endif
TARGETS += sdcc-librarian ifeq ($(OPT_ENABLE_DOC), 1)
PKGS += $(SDCC_LIBRARIAN) TARGETS += sdcc-doc
endif
# always install docs, which don't need to be built
PKGS += $(SDCC_DOC)
ifeq ($(OPT_DISABLE_SDCPP), 0)
SDCC_LIBS += support/cpp2
endif
TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-aslink sdcc-librarian
PKGS += $(SDCC_LIBS) src device/include $(SDCC_ASLINK) $(SDCC_LIBRARIAN)
PKGS_TINI = $(SDCC_LIBS) $(SDCC_ASLINK) \ PKGS_TINI = $(SDCC_LIBS) $(SDCC_ASLINK) \
src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN) src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
...@@ -59,10 +81,10 @@ sdcc-cc: sdcc-libs ...@@ -59,10 +81,10 @@ sdcc-cc: sdcc-libs
$(MAKE) -C src $(MAKE) -C src
sdcc-aslink: sdcc-aslink:
for as in $(SDCC_ASLINK); do $(MAKE) -C $$as; done for as in $(SDCC_ASLINK); do $(MAKE) -C $$as ; done
sdcc-misc: sdcc-misc:
for misc in $(SDCC_MISC); do $(MAKE) -C $$misc; done for misc in $(SDCC_MISC); do $(MAKE) -C $$misc ; done
sdcc-packihx: sdcc-packihx:
$(MAKE) -C $(SDCC_PACKIHX) $(MAKE) -C $(SDCC_PACKIHX)
...@@ -70,16 +92,19 @@ sdcc-packihx: ...@@ -70,16 +92,19 @@ sdcc-packihx:
sdcc-librarian: sdcc-librarian:
$(MAKE) -C $(SDCC_LIBRARIAN) $(MAKE) -C $(SDCC_LIBRARIAN)
sdcc-device: sdcc-cc sdcc-aslink sdcc-device-inc:
$(MAKE) -C device/include $(MAKE) -C device/include
sdcc-device-lib: sdcc-cc sdcc-aslink
$(MAKE) -C device/lib $(MAKE) -C device/lib
sdcc-device-tini: sdcc-device-tini:
$(MAKE) -C device/include $(MAKE) -C device/include
$(MAKE) -C device/lib modelDS390 $(MAKE) -C device/lib modelDS390
# Empty for now, as doc depends on latex and latex2html # doc depends on latex and latex2html
sdcc-doc: sdcc-doc:
$(MAKE) -C doc
sdcc: $(TARGETS) sdcc: $(TARGETS)
...@@ -121,31 +146,31 @@ uninstall: ...@@ -121,31 +146,31 @@ uninstall:
# -------------------------------------------------- # --------------------------------------------------
clean: clean:
@echo "+ Cleaning root of the project..." @echo "+ Cleaning root of the project..."
$(MAKE) -f clean.mk clean $(MAKE) -f $(srcdir)/clean.mk clean
@echo "+ Cleaning packages in their directories..." @echo "+ Cleaning packages in their directories..."
for pkg in $(PKGS); do\ for pkg in $(PKGS); do\
$(MAKE) PORTS="$(PORTS)" EXEEXT=$(EXEEXT) -C $$pkg -f clean.mk clean ;\ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) clean ;\
done done
# Deleting all files created by configuring or building the program # Deleting all files created by configuring or building the program
# ----------------------------------------------------------------- # -----------------------------------------------------------------
distclean: distclean:
@echo "+ DistCleaning root of the project..."
$(MAKE) -f clean.mk distclean
@echo "+ DistCleaning packages using clean.mk..." @echo "+ DistCleaning packages using clean.mk..."
for pkg in $(PKGS); do\ for pkg in $(PKGS); do\
$(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) -f clean.mk distclean ;\ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) distclean ;\
done done
for pkg in $(SDCC_EXTRA); do \ for pkg in $(SDCC_EXTRA); do \
$(MAKE) -C $$pkg clean; \ $(MAKE) -C $$pkg distclean; \
done done
@echo "+ DistCleaning root of the project..."
$(MAKE) -f $(srcdir)/clean.mk distclean
# Like clean but some files may still exist # Like clean but some files may still exist
# ----------------------------------------- # -----------------------------------------
mostlyclean: clean mostlyclean: clean
$(MAKE) -f clean.mk mostlyclean $(MAKE) -f $(srcdir)/clean.mk mostlyclean
for pkg in $(PKGS); do\ for pkg in $(PKGS); do\
$(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean ;\ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean ;\
done done
...@@ -153,9 +178,9 @@ mostlyclean: clean ...@@ -153,9 +178,9 @@ mostlyclean: clean