Commit 621ffe0c authored by Geert Stappers's avatar Geert Stappers

Import Upstream version 3.3.0+dfsg

parent 4f22102b

Too many changes to show.

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

This diff is collapsed.
......@@ -39,26 +39,28 @@ include_dir_suffix = @include_dir_suffix@
lib_dir_suffix = @lib_dir_suffix@
# Modules to enable/disable
OPT_DISABLE_AVR = @OPT_DISABLE_AVR@
OPT_DISABLE_DS390 = @OPT_DISABLE_DS390@
OPT_DISABLE_DS400 = @OPT_DISABLE_DS400@
OPT_DISABLE_HC08 = @OPT_DISABLE_HC08@
OPT_DISABLE_MCS51 = @OPT_DISABLE_MCS51@
OPT_DISABLE_PIC14 = @OPT_DISABLE_PIC14@
OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
OPT_DISABLE_XA51 = @OPT_DISABLE_XA51@
OPT_DISABLE_Z80 = @OPT_DISABLE_Z80@
OPT_DISABLE_Z180 = @OPT_DISABLE_Z180@
OPT_DISABLE_R2K = @OPT_DISABLE_R2K@
OPT_DISABLE_GBZ80 = @OPT_DISABLE_GBZ80@
OPT_DISABLE_AVR = @OPT_DISABLE_AVR@
OPT_DISABLE_DS390 = @OPT_DISABLE_DS390@
OPT_DISABLE_DS400 = @OPT_DISABLE_DS400@
OPT_DISABLE_GBZ80 = @OPT_DISABLE_GBZ80@
OPT_DISABLE_HC08 = @OPT_DISABLE_HC08@
OPT_DISABLE_MCS51 = @OPT_DISABLE_MCS51@
OPT_DISABLE_PIC14 = @OPT_DISABLE_PIC14@
OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
OPT_DISABLE_R2K = @OPT_DISABLE_R2K@
OPT_DISABLE_XA51 = @OPT_DISABLE_XA51@
OPT_DISABLE_Z180 = @OPT_DISABLE_Z180@
OPT_DISABLE_Z80 = @OPT_DISABLE_Z80@
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@
OPT_ENABLE_DOC = @OPT_ENABLE_DOC@
SLIB = $(top_builddir)/support/util
OPT_DISABLE_DEVICE_LIB = @OPT_DISABLE_DEVICE_LIB@
OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@
OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@
OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@
OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@
SLIB = $(top_builddir)/support/util
EXEEXT = @EXEEXT@
transform = @program_transform_name@
......
#
#
# sdcc project main Makefile
#
SHELL = /bin/sh
......@@ -9,6 +9,8 @@ srcdir = @srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXEEXT = @EXEEXT@
include Makefile.common
SDCC_LIBS = support/makebin
......@@ -20,68 +22,80 @@ SDCC_EXTRA = support/regression support/valdiag
SDCC_PACKIHX = support/packihx
SDCC_LIBRARIAN = support/librarian
SDCC_SDRANLIB = support/sdranlib
SDCC_SDBINUTILS = support/sdbinutils
TARGETS = sdcc-librarian sdcc-sdranlib
TARGETS = sdcc-librarian
ifeq ($(OPT_DISABLE_HC08), 0)
SDCC_AS += sdas/as6808
SDCC_LD += sdcc-ld6808
SDCC_AS += sdas/as6808
SDCC_LD += sdcc-ld6808
endif
ifeq ($(OPT_DISABLE_DS390), 0)
SDCC_AS += sdas/as8xcxxx
endif
ifeq ($(OPT_DISABLE_MCS51), 0)
SDCC_AS += sdas/as8051
SDCC_LD += sdcc-ld8051
SDCC_MISC += debugger/mcs51
SDCC_AS += sdas/as8051
SDCC_LD += sdcc-ld8051
SDCC_MISC += debugger/mcs51
endif
ifeq ($(OPT_DISABLE_Z80), 0)
SDCC_AS += sdas/asz80
SDCC_LD += sdcc-ldz80
SDCC_AS += sdas/asz80
SDCC_LD += sdcc-ldz80
endif
ifeq ($(OPT_DISABLE_R2K), 0)
SDCC_AS += sdas/asrab
SDCC_LD += sdcc-ldz80
SDCC_AS += sdas/asrab
SDCC_LD += sdcc-ldz80
endif
ifeq ($(OPT_DISABLE_GBZ80), 0)
SDCC_AS += sdas/asgb
SDCC_LD += sdcc-ldgb
SDCC_AS += sdas/asgb
SDCC_LD += sdcc-ldgb
endif
ifeq ($(OPT_DISABLE_UCSIM), 0)
TARGETS += sdcc-misc
SDCC_MISC += sim/ucsim
PKGS += $(SDCC_MISC)
TARGETS += sdcc-misc
SDCC_MISC += sim/ucsim
PKGS += $(SDCC_MISC)
endif
SDCC_BINUTILS =
ifeq ($(OPT_DISABLE_SDBINUTILS), 0)
TARGETS += sdcc-sdbinutils
PKGS += $(SDCC_SDBINUTILS)
SDBINUTILS_BINS = sdar$(EXEEXT) sdranlib$(EXEEXT) sdnm$(EXEEXT) sdobjcopy$(EXEEXT)
SDCC_BINUTILS = sdcc-sdbinutils
endif
ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
TARGETS += sdcc-device-lib
PKGS += device/lib device/non-free/lib
TARGETS += sdcc-device-lib
PKGS += device/lib device/non-free/lib
endif
ifeq ($(OPT_DISABLE_PACKIHX), 0)
TARGETS += sdcc-packihx
PKGS += $(SDCC_PACKIHX)
TARGETS += sdcc-packihx
PKGS += $(SDCC_PACKIHX)
endif
ifeq ($(OPT_ENABLE_DOC), 1)
TARGETS += sdcc-doc
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/cpp
SDCC_LIBS += support/cpp
endif
TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
PKGS += $(SDCC_LIBS) src device/include device/non-free/include $(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) $(SDCC_SDRANLIB) $(SDCC_SCRIPTS)
PKGS += $(SDCC_LIBS) src device/include device/non-free/include \
$(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) \
$(SDCC_SDBINUTILS) $(SDCC_SCRIPTS)
PKGS_TINI = $(SDCC_LIBS) $(SDCC_AS) sdas/linksrc \
src device/include device/non-free/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
PORTS = $(shell cat ports.build)
ALLPORTS = $(shell cat ports.all)
......@@ -115,14 +129,22 @@ sdcc-packihx:
sdcc-librarian:
$(MAKE) -C $(SDCC_LIBRARIAN)
sdcc-sdranlib:
$(MAKE) -C $(SDCC_SDRANLIB)
sdcc-sdbinutils:
$(MAKE) -C $(SDCC_SDBINUTILS)
# in some cases (cygwin) the real binaries are in .libs
for bin in $(SDBINUTILS_BINS); do \
if [ -f $(SDCC_SDBINUTILS)/binutils/.libs/$$bin ]; then \
cp $(SDCC_SDBINUTILS)/binutils/.libs/$$bin bin; \
else \
cp $(SDCC_SDBINUTILS)/binutils/$$bin bin; \
fi \
done
sdcc-device-inc:
$(MAKE) -C device/include
$(MAKE) -C device/non-free/include
sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld
sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld $(SDCC_BINUTILS)
$(MAKE) -C device/lib
$(MAKE) -C device/non-free/lib
......@@ -137,7 +159,7 @@ sdcc-doc:
sdcc: $(TARGETS)
sdcc-tini: sdcc-librarian sdcc-sdranlib sdcc-cc sdcc-as sdcc-ld sdcc-device-tini sdcc-packihx
sdcc-tini: sdcc-librarian sdcc-cc sdcc-as sdcc-ld sdcc-device-tini sdcc-packihx
$(MAKE) -f main.mk all
# Some interesting sub rules
......@@ -153,15 +175,6 @@ install: checkconf sdcc
$(MAKE) -C $$pkg install ;\
done
install-tini: checkconf sdcc
$(MAKE) -f main.mk install
@for pkg in $(PKGS_TINI); do\
$(MAKE) -C $$pkg install ;\
done
$(MAKE) -C device/lib install
# Deleting all the installed files
# --------------------------------
uninstall:
......@@ -170,7 +183,6 @@ uninstall:
$(MAKE) -C $$pkg uninstall ;\
done
# Deleting all files created by building the program
# --------------------------------------------------
clean:
......@@ -202,7 +214,6 @@ mostlyclean: clean
$(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean ;\
done
# Deleting everything that can reconstructed by this Makefile. It deletes
# everything deleted by distclean plus files created by bison, stc.
# -----------------------------------------------------------------------
......@@ -212,7 +223,6 @@ realclean: distclean
$(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) realclean ;\
done
# Creating distribution
# ---------------------
dist: distclean
......@@ -222,17 +232,14 @@ dist: distclean
mkdist sdcc;\
fi
# Performing self-test
# --------------------
check:
# Performing installation test
# ----------------------------
installcheck:
# Creating dependencies
# ---------------------
dep: $(SDCC_LIBS)
......@@ -241,7 +248,6 @@ dep: $(SDCC_LIBS)
$(MAKE) -C $$pkg dep ;\
done
# My rules
# --------
newer: distclean
......@@ -257,7 +263,6 @@ newer: distclean
putcopyright:
'put(c)' -s $(STARTYEAR) *.cc *.h *.y *.l
# Remaking configuration
# ----------------------
configure: configure.in
......
This diff is collapsed.
......@@ -22,10 +22,8 @@
<CustomBuild Include="bin_vc\sdcclib.exe" />
<CustomBuild Include="bin_vc\sdcpp.exe" />
<CustomBuild Include="bin_vc\sdld.exe" />
<CustomBuild Include="bin_vc\sdld6808.exe" />
<CustomBuild Include="bin_vc\sdldgb.exe" />
<CustomBuild Include="bin_vc\sdld