From 157fbddc680b42efee66f8214098329ef3a2cd41 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Tue, 31 Jan 2012 21:15:28 +0000 Subject: [PATCH] Avoid paths in .include directives. The path needs to be rather set in the Makefile to allow to set it later depending on the target currently built. git-svn-id: svn://svn.cc65.org/cc65/trunk@5432 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/common/copydata.s | 4 ++-- libsrc/geos-cbm/conio/_scrsize.s | 2 +- libsrc/geos-cbm/devel/crt0.s | 2 +- libsrc/geos-cbm/devel/fio_module.s | 4 ++-- libsrc/geos-cbm/devel/geos-stdjoy.s | 2 +- libsrc/geos-cbm/devel/geos-tgi.s | 8 ++++---- libsrc/geos-cbm/devel/mainargs.s | 4 ++-- libsrc/geos-cbm/devel/mcbdefault.s | 6 +++--- libsrc/geos-cbm/devel/oserrlist.s | 2 +- libsrc/geos-cbm/devel/oserror.s | 2 +- libsrc/geos-cbm/devel/randomize.s | 2 +- libsrc/geos-cbm/disk/dio_params.s | 6 +++--- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libsrc/geos-cbm/common/copydata.s b/libsrc/geos-cbm/common/copydata.s index 2efd7c352..26e2cef10 100644 --- a/libsrc/geos-cbm/common/copydata.s +++ b/libsrc/geos-cbm/common/copydata.s @@ -6,8 +6,8 @@ .export copydata .import __DATA_LOAD__, __DATA_RUN__, __DATA_SIZE__ - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" + .include "geossym.inc" + .include "jumptab.inc" copydata: lda #<__DATA_SIZE__ ; no need to check if it is == 0 diff --git a/libsrc/geos-cbm/conio/_scrsize.s b/libsrc/geos-cbm/conio/_scrsize.s index b469d2a9d..eaa151bd8 100644 --- a/libsrc/geos-cbm/conio/_scrsize.s +++ b/libsrc/geos-cbm/conio/_scrsize.s @@ -7,7 +7,7 @@ ; 6.3.2001, 17.4.2003 - .include "../inc/geossym.inc" + .include "geossym.inc" .export xsize, ysize .export screensize diff --git a/libsrc/geos-cbm/devel/crt0.s b/libsrc/geos-cbm/devel/crt0.s index 1e138e8e4..cc7cab4fd 100644 --- a/libsrc/geos-cbm/devel/crt0.s +++ b/libsrc/geos-cbm/devel/crt0.s @@ -13,7 +13,7 @@ .import callmain .import zerobss .importzp sp - .include "../inc/jumptab.inc" + .include "jumptab.inc" ; ------------------------------------------------------------------------ ; Place the startup code in a special segment. diff --git a/libsrc/geos-cbm/devel/fio_module.s b/libsrc/geos-cbm/devel/fio_module.s index 0ced16c11..166acdcd2 100644 --- a/libsrc/geos-cbm/devel/fio_module.s +++ b/libsrc/geos-cbm/devel/fio_module.s @@ -12,8 +12,8 @@ FILEDES = 3 ; first free to use file descriptor - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "geossym.inc" + .include "const.inc" .include "errno.inc" .include "fcntl.inc" diff --git a/libsrc/geos-cbm/devel/geos-stdjoy.s b/libsrc/geos-cbm/devel/geos-stdjoy.s index 8b654bc9c..61d2906aa 100644 --- a/libsrc/geos-cbm/devel/geos-stdjoy.s +++ b/libsrc/geos-cbm/devel/geos-stdjoy.s @@ -9,7 +9,7 @@ .include "joy-kernel.inc" .include "joy-error.inc" - .include "../inc/geossym.inc" + .include "geossym.inc" .macpack generic diff --git a/libsrc/geos-cbm/devel/geos-tgi.s b/libsrc/geos-cbm/devel/geos-tgi.s index 8cbb332d3..542e8a0be 100644 --- a/libsrc/geos-cbm/devel/geos-tgi.s +++ b/libsrc/geos-cbm/devel/geos-tgi.s @@ -8,10 +8,10 @@ .include "tgi-kernel.inc" .include "tgi-error.inc" - .include "../inc/const.inc" - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" - .include "../inc/geossym2.inc" + .include "const.inc" + .include "jumptab.inc" + .include "geossym.inc" + .include "geossym2.inc" .macpack generic diff --git a/libsrc/geos-cbm/devel/mainargs.s b/libsrc/geos-cbm/devel/mainargs.s index d5ffbf3e5..5474dc589 100644 --- a/libsrc/geos-cbm/devel/mainargs.s +++ b/libsrc/geos-cbm/devel/mainargs.s @@ -15,8 +15,8 @@ .constructor initmainargs, 24 .import __argc, __argv - .include "../inc/const.inc" - .include "../inc/geossym.inc" + .include "const.inc" + .include "geossym.inc" ;--------------------------------------------------------------------------- ; Setup arguments for main diff --git a/libsrc/geos-cbm/devel/mcbdefault.s b/libsrc/geos-cbm/devel/mcbdefault.s index 665cc426e..6fca43a0b 100644 --- a/libsrc/geos-cbm/devel/mcbdefault.s +++ b/libsrc/geos-cbm/devel/mcbdefault.s @@ -13,9 +13,9 @@ .export _mouse_def_callbacks ; .include "mouse-kernel.inc" -; .include "../inc/const.inc" -; .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" +; .include "const.inc" +; .include "geossym.inc" + .include "jumptab.inc" ; .macpack generic diff --git a/libsrc/geos-cbm/devel/oserrlist.s b/libsrc/geos-cbm/devel/oserrlist.s index 90c54fbe7..1b6e18969 100644 --- a/libsrc/geos-cbm/devel/oserrlist.s +++ b/libsrc/geos-cbm/devel/oserrlist.s @@ -14,7 +14,7 @@ ; error code could not be found. ; - .include "../inc/const.inc" + .include "const.inc" .export __sys_oserrlist diff --git a/libsrc/geos-cbm/devel/oserror.s b/libsrc/geos-cbm/devel/oserror.s index 50dd32795..3198da778 100644 --- a/libsrc/geos-cbm/devel/oserror.s +++ b/libsrc/geos-cbm/devel/oserror.s @@ -9,7 +9,7 @@ .export __osmaperrno .include "errno.inc" - .include "../inc/const.inc" + .include "const.inc" .code diff --git a/libsrc/geos-cbm/devel/randomize.s b/libsrc/geos-cbm/devel/randomize.s index c16bc54ef..168f6b767 100644 --- a/libsrc/geos-cbm/devel/randomize.s +++ b/libsrc/geos-cbm/devel/randomize.s @@ -8,7 +8,7 @@ .export __randomize .import _srand - .include "../inc/geossym.inc" + .include "geossym.inc" __randomize: lda random ; get random value from internal generator diff --git a/libsrc/geos-cbm/disk/dio_params.s b/libsrc/geos-cbm/disk/dio_params.s index ef88a59b4..6d05b4721 100644 --- a/libsrc/geos-cbm/disk/dio_params.s +++ b/libsrc/geos-cbm/disk/dio_params.s @@ -8,9 +8,9 @@ .import popax,pushax,_dio_log_to_phys .importzp ptr1 .export dio_params,dio_secnum - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" - .include "../inc/dio.inc" + .include "geossym.inc" + .include "jumptab.inc" + .include "dio.inc" .bss dio_secnum: .res 2 -- 2.39.5