Removed debug msg; updated build for z80; added debugger to Makefile.

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@258 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/Makefile b/Makefile
index 9cc27724a4da72ab105b2b898aa4605e11765a79..61575aa2661541ffbfff1b1926f64f9b4237f83f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc
        $(MAKE) -f main.mk all
 
 # Some interesting sub rules
-sdcc-bin: sdcc-cc sdcc-aslink
+sdcc-bin: sdcc-cc sdcc-aslink sdcc-misc
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------

diff --git a/src/z80/ralloc.c b/src/z80/ralloc.c
index 16148a817b743d8dc6189a69b43b0eb6ff267f02..1b89494d0ff43a5d6a25df3858745a79f109e8b7 100644 (file)
--- a/src/z80/ralloc.c
+++ b/src/z80/ralloc.c
@@ -1830,7 +1830,6 @@ static void packRegsForHLUse (iCode *ic)
        goto hluse;
     return;
  hluse:
-    printf("Hey, it worked!\n");
     OP_SYMBOL(IC_RESULT(ic))->accuse = ACCUSE_HL;
 }
 

diff --git a/support/scripts/build.mak b/support/scripts/build.mak
index 88a0befff1813186f5134ac953add02c672178b0..bbc0e09cd03f5c8e767c9828b4b55d66c3000285 100644 (file)
--- a/support/scripts/build.mak
+++ b/support/scripts/build.mak
@@ -11,9 +11,9 @@ SDCCLIB = $(BUILD)
 CVSFLAGS = -z5
 CVS = cvs
 DIR = .
-VER = 2.94
+VER = 2.2.1
 # Used as a branch name.
-SHORTVER = 294
+SHORTVER = 221
 
 ROOT_GBDK = :pserver:anonymous@cvs.gbdk.sourceforge.net:/cvsroot/gbdk
 ROOT_SDCC = :pserver:anonymous@cvs.sdcc.sourceforge.net:/cvsroot/sdcc
@@ -37,8 +37,7 @@ SE =
 E =
 SDCC_ROOT = /usr/lib/sdcc
 
-#all: logged_in dist
-all: dist
+all: logged_in dist
 
 clean:
        for i in sdcc gbdk-lib gbdk-support/lcc; do make -C $$i clean; done
@@ -46,9 +45,9 @@ clean:
        rm -rf $(BUILD) gbdk-lib gbdk-support sdcc logged_in
 
 update: logged_in
-       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_SDCC) co -r gbdk-$(SHORTVER) sdcc
-       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r gbdk-$(SHORTVER) gbdk-lib
-       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r gbdk-$(SHORTVER) gbdk-support
+       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_SDCC) co -r sdcc-$(SHORTVER) sdcc
+       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-lib
+       cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-support
 
 _sdcc: sdcc-bin sdcc-lib sdcc-doc
 
@@ -61,7 +60,7 @@ sdcc-bin: sdcc/sdccconf.h
        make -C sdcc sdcc-bin
        mkdir -p $(BUILD)/bin
        for i in \
-       sdcc sdcpp link-gbz80 as-gbz80 aslink asx8051 sdcdb; \
+       sdcc sdcpp link-z80 as-z80 aslink asx8051 sdcdb; \
        do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
        cp sdcc/sim/ucsim/s51.src/s51$(E) $(BUILD)/bin
        cp sdcc/sim/ucsim/z80.src/sz80$(E) $(BUILD)/bin
@@ -84,37 +83,21 @@ sdcc-lib: sdcc-lib-z80 sdcc-lib-gen
 sdcc-lib-z80:
        make -C gbdk-lib/libc SDCCLIB=$(BUILD) PORTS=z80 PLATFORMS=consolez80
        (cd gbdk-lib/build; tar cf - consolez80 z80) | (cd $(BUILD)/lib; tar xf -)
+       mkdir -p $(BUILD)/include/gbdk-lib
+       (cd gbdk-lib/include; tar cf - .) | (cd $(BUILD)/include/gbdk-lib; tar xf -)
 
 sdcc-lib-gen:
        make -C sdcc sdcc-device
 
+lcc:
+       make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/
+       cp gbdk-support/lcc/lcc$(E) $(BUILD)/bin
+
 sdcc/sdccconf.h: sdcc/configure
        cd sdcc; \
        ./configure --datadir=$(SDCC_ROOT)
 
-_gbdk-lib: _sdcc-min _gbdk-support
-       cp -r gbdk-lib/include $(BUILD)
-       make -C gbdk-lib SDCCLIB=$(SDCCLIB) PORTS=gbz80 PLATFORMS=gb
-
-_gbdk-support:
-       make -C gbdk-support/lcc clean
-       make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/
-       mkdir -p $(BUILD)/bin
-       cp gbdk-support/lcc/lcc$(SE) $(BUILD)/bin/lcc$(E)
-
-dist: _sdcc-min _gbdk-lib _gbdk-support
-       mkdir -p $(BUILD)/bin
-       mkdir -p $(BUILD)/lib
-       cp -r gbdk-lib/build/gbz80 $(BUILD)/lib
-       cp -r gbdk-lib/build/gb $(BUILD)/lib
-       make -C gbdk-lib/libc clean
-       make -C gbdk-lib/examples/gb make.bat
-       cp -r gbdk-lib/examples $(BUILD)
-       cp -r gbdk-lib/libc $(BUILD)
-       cp -r sdcc/doc $(BUILD)
-       cp gbdk-support/README $(BUILD)
-       strip $(BUILD)/bin/*
-       rm -rf `find gbdk -name "CVS"`
+dist: _sdcc lcc tidy
 
 zdist: dist
        tar czf gbdk-$(VER).tar.gz gbdk
@@ -123,4 +106,3 @@ logged_in:
        cvs -d$(ROOT_GBDK) login
        cvs -d$(ROOT_SDCC) login
        touch logged_in
-       make -f update.mak update