From 0a174b5c835e5487aaa0db4c54e7db84ea1a2e9f Mon Sep 17 00:00:00 2001 From: MaartenBrock Date: Thu, 14 Sep 2006 18:32:41 +0000 Subject: [PATCH] moved link/ to as/link/ git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4377 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 35 +++++++++++++++++++++++++++++ Makefile.in | 2 +- {link => as/link}/Makefile.in | 2 +- {link => as/link}/README | 0 {link => as/link}/clean.mk | 0 {link => as/link}/z80/Makefile.in | 0 {link => as/link}/z80/aslink.h | 0 {link => as/link}/z80/clean.mk | 0 {link => as/link}/z80/conf.mk | 0 {link => as/link}/z80/linkgbz80.dsp | 4 ++-- {link => as/link}/z80/linkz80.dsp | 4 ++-- {link => as/link}/z80/lkarea.c | 0 {link => as/link}/z80/lkdata.c | 0 {link => as/link}/z80/lkeval.c | 0 {link => as/link}/z80/lkgb.c | 0 {link => as/link}/z80/lkgg.c | 0 {link => as/link}/z80/lkhead.c | 0 {link => as/link}/z80/lkihx.c | 0 {link => as/link}/z80/lklex.c | 0 {link => as/link}/z80/lklibr.c | 0 {link => as/link}/z80/lklist.c | 0 {link => as/link}/z80/lkmain.c | 0 {link => as/link}/z80/lkrloc.c | 0 {link => as/link}/z80/lks19.c | 0 {link => as/link}/z80/lksym.c | 0 configure | 2 +- sdcc.dsw | 4 ++-- 27 files changed, 44 insertions(+), 9 deletions(-) rename {link => as/link}/Makefile.in (90%) rename {link => as/link}/README (100%) rename {link => as/link}/clean.mk (100%) rename {link => as/link}/z80/Makefile.in (100%) rename {link => as/link}/z80/aslink.h (100%) rename {link => as/link}/z80/clean.mk (100%) rename {link => as/link}/z80/conf.mk (100%) rename {link => as/link}/z80/linkgbz80.dsp (95%) rename {link => as/link}/z80/linkz80.dsp (95%) rename {link => as/link}/z80/lkarea.c (100%) rename {link => as/link}/z80/lkdata.c (100%) rename {link => as/link}/z80/lkeval.c (100%) rename {link => as/link}/z80/lkgb.c (100%) rename {link => as/link}/z80/lkgg.c (100%) rename {link => as/link}/z80/lkhead.c (100%) rename {link => as/link}/z80/lkihx.c (100%) rename {link => as/link}/z80/lklex.c (100%) rename {link => as/link}/z80/lklibr.c (100%) rename {link => as/link}/z80/lklist.c (100%) rename {link => as/link}/z80/lkmain.c (100%) rename {link => as/link}/z80/lkrloc.c (100%) rename {link => as/link}/z80/lks19.c (100%) rename {link => as/link}/z80/lksym.c (100%) diff --git a/ChangeLog b/ChangeLog index e7a9acde..0e3315f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2006-09-14 Maarten Brock + + * as/link, + * as/link/Makefile.in, + * as/link/z80/linkgbz80.dsp, + * as/link/z80/linkz80.dsp, + * configure, + * link, + * link/clean.mk, + * link/Makefile.in, + * link/README, + * link/z80, + * link/z80/aslink.h, + * link/z80/clean.mk, + * link/z80/conf.mk, + * link/z80/linkgbz80.dsp, + * link/z80/linkz80.dsp, + * link/z80/lkarea.c, + * link/z80/lkdata.c, + * link/z80/lkeval.c, + * link/z80/lkgb.c, + * link/z80/lkgg.c, + * link/z80/lkhead.c, + * link/z80/lkihx.c, + * link/z80/lklex.c, + * link/z80/lklibr.c, + * link/z80/lklist.c, + * link/z80/lkmain.c, + * link/z80/lkrloc.c, + * link/z80/lks19.c, + * link/z80/lksym.c, + * link/z80/Makefile.in, + * Makefile.in, + * sdcc.dsw: moved link/ to as/link/ + 2006-09-11 Maarten Brock * as/mcs51/i51mch.c (machine): fixed warning diff --git a/Makefile.in b/Makefile.in index 72c60ff6..fd9410ad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,7 +30,7 @@ SDCC_MISC += debugger/mcs51 endif ifeq ($(OPT_DISABLE_Z80), 0) -SDCC_ASLINK += as link +SDCC_ASLINK += as as/link endif ifeq ($(OPT_DISABLE_UCSIM), 0) diff --git a/link/Makefile.in b/as/link/Makefile.in similarity index 90% rename from link/Makefile.in rename to as/link/Makefile.in index 54cf61a1..9776ae60 100644 --- a/link/Makefile.in +++ b/as/link/Makefile.in @@ -7,7 +7,7 @@ include $(top_builddir)Makefile.common PORTS = z80 gbz80 all: - $(MAKE) -C z80 _link-z80 _link-gbz80 E=$(E) BUILDDIR=../../bin/ + $(MAKE) -C z80 _link-z80 _link-gbz80 E=$(E) BUILDDIR=../../../bin/ install: all $(INSTALL) $(top_builddir)bin/link-z80$(EXEEXT) `echo $(DESTDIR)$(bindir)/link-z80$(EXEEXT)|sed '$(transform)'` diff --git a/link/README b/as/link/README similarity index 100% rename from link/README rename to as/link/README diff --git a/link/clean.mk b/as/link/clean.mk similarity index 100% rename from link/clean.mk rename to as/link/clean.mk diff --git a/link/z80/Makefile.in b/as/link/z80/Makefile.in similarity index 100% rename from link/z80/Makefile.in rename to as/link/z80/Makefile.in diff --git a/link/z80/aslink.h b/as/link/z80/aslink.h similarity index 100% rename from link/z80/aslink.h rename to as/link/z80/aslink.h diff --git a/link/z80/clean.mk b/as/link/z80/clean.mk similarity index 100% rename from link/z80/clean.mk rename to as/link/z80/clean.mk diff --git a/link/z80/conf.mk b/as/link/z80/conf.mk similarity index 100% rename from link/z80/conf.mk rename to as/link/z80/conf.mk diff --git a/link/z80/linkgbz80.dsp b/as/link/z80/linkgbz80.dsp similarity index 95% rename from link/z80/linkgbz80.dsp rename to as/link/z80/linkgbz80.dsp index 80e1d506..db0fa18e 100644 --- a/link/z80/linkgbz80.dsp +++ b/as/link/z80/linkgbz80.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\bin_vc\link-gbz80.exe" +# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin_vc\link-gbz80.exe" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "linkgbz80 - Win32 Debug" @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin_vc\link-gbz80.exe" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin_vc\link-gbz80.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/link/z80/linkz80.dsp b/as/link/z80/linkz80.dsp similarity index 95% rename from link/z80/linkz80.dsp rename to as/link/z80/linkz80.dsp index eb63e0c5..cc287c78 100644 --- a/link/z80/linkz80.dsp +++ b/as/link/z80/linkz80.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\bin_vc\link-z80.exe" +# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin_vc\link-z80.exe" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "linkz80 - Win32 Debug" @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin_vc\link-z80.exe" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin_vc\link-z80.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/link/z80/lkarea.c b/as/link/z80/lkarea.c similarity index 100% rename from link/z80/lkarea.c rename to as/link/z80/lkarea.c diff --git a/link/z80/lkdata.c b/as/link/z80/lkdata.c similarity index 100% rename from link/z80/lkdata.c rename to as/link/z80/lkdata.c diff --git a/link/z80/lkeval.c b/as/link/z80/lkeval.c similarity index 100% rename from link/z80/lkeval.c rename to as/link/z80/lkeval.c diff --git a/link/z80/lkgb.c b/as/link/z80/lkgb.c similarity index 100% rename from link/z80/lkgb.c rename to as/link/z80/lkgb.c diff --git a/link/z80/lkgg.c b/as/link/z80/lkgg.c similarity index 100% rename from link/z80/lkgg.c rename to as/link/z80/lkgg.c diff --git a/link/z80/lkhead.c b/as/link/z80/lkhead.c similarity index 100% rename from link/z80/lkhead.c rename to as/link/z80/lkhead.c diff --git a/link/z80/lkihx.c b/as/link/z80/lkihx.c similarity index 100% rename from link/z80/lkihx.c rename to as/link/z80/lkihx.c diff --git a/link/z80/lklex.c b/as/link/z80/lklex.c similarity index 100% rename from link/z80/lklex.c rename to as/link/z80/lklex.c diff --git a/link/z80/lklibr.c b/as/link/z80/lklibr.c similarity index 100% rename from link/z80/lklibr.c rename to as/link/z80/lklibr.c diff --git a/link/z80/lklist.c b/as/link/z80/lklist.c similarity index 100% rename from link/z80/lklist.c rename to as/link/z80/lklist.c diff --git a/link/z80/lkmain.c b/as/link/z80/lkmain.c similarity index 100% rename from link/z80/lkmain.c rename to as/link/z80/lkmain.c diff --git a/link/z80/lkrloc.c b/as/link/z80/lkrloc.c similarity index 100% rename from link/z80/lkrloc.c rename to as/link/z80/lkrloc.c diff --git a/link/z80/lks19.c b/as/link/z80/lks19.c similarity index 100% rename from link/z80/lks19.c rename to as/link/z80/lks19.c diff --git a/link/z80/lksym.c b/as/link/z80/lksym.c similarity index 100% rename from link/z80/lksym.c rename to as/link/z80/lksym.c diff --git a/configure b/configure index c0224a65..5c3bf823 100755 --- a/configure +++ b/configure @@ -8162,7 +8162,7 @@ test $OPT_DISABLE_XA51 = 0 && ac_config_files="$ac_config_files src/xa if test $OPT_DISABLE_Z80 = 0; then - ac_config_files="$ac_config_files src/z80/Makefile as/Makefile as/z80/Makefile link/Makefile link/z80/Makefile" + ac_config_files="$ac_config_files src/z80/Makefile as/Makefile as/z80/Makefile as/link/Makefile as/link/z80/Makefile" test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/z80/Makefile device/lib/gbz80/Makefile" diff --git a/sdcc.dsw b/sdcc.dsw index b5846652..954f07aa 100644 --- a/sdcc.dsw +++ b/sdcc.dsw @@ -240,7 +240,7 @@ Package=<4> ############################################################################### -Project: "linkgbz80"=.\link\z80\linkgbz80.dsp - Package Owner=<4> +Project: "linkgbz80"=.\as\link\z80\linkgbz80.dsp - Package Owner=<4> Package=<5> {{{ @@ -252,7 +252,7 @@ Package=<4> ############################################################################### -Project: "linkz80"=.\LINK\Z80\linkz80.dsp - Package Owner=<4> +Project: "linkz80"=.\as\link\z80\linkz80.dsp - Package Owner=<4> Package=<5> {{{ -- 2.47.2