[ro-oslib-commits] OSLib/!OsLib/Source GNUmakefile.settings,NONE,1.1 GNUmakefile,1.2,1.3 GNUmakefile.source,1.2,1.3

[Tony v. d. H. <to...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9935/!OsLib/Source

Modified Files:
	GNUmakefile GNUmakefile.source 
Added Files:
	GNUmakefile.settings 
Log Message:
Changes to facilitate GCCSDK autobuilder support. (20051231-1 John Tytgat)

--- NEW FILE: GNUmakefile.settings ---
#
# Makefile specifying the environment settings for all GNUmakefiles
# inside the Source directory.
#
# SOURCEDIR must be defined by the caller, and must
# point to the top of the source tree.

#------------------------------------------------------------------------
# environment settings
ifeq ($(origin SOURCEDIR), undefined)
$(error SOURCEDIR is not defined)
endif
BINDIR			= ${SOURCEDIR}/../Bin

export BINDIR

#------------------------------------------------------------------------

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/GNUmakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GNUmakefile	3 May 2004 15:03:26 -0000	1.2
--- GNUmakefile	31 Dec 2005 12:06:31 -0000	1.3
***************
*** 4,17 ****
   
  #------------------------------------------------------------------------
  
  #------------------------------------------------------------------------
  # paths & directories
- SOURCEDIR	= ${CURDIR}
- BINDIR		= ${SOURCEDIR}/../Bin
- CROSSPATH	= /home/riscos/cross
  
  #------------------------------------------------------------------------
  # tools
! LIBFILE		= ${CROSSPATH}/bin/libfile
  INDEXHELP	= ${BINDIR}/IndexHelp
  BINDHELP	= ${BINDIR}/BindHelp
--- 4,17 ----
   
  #------------------------------------------------------------------------
+ include ../GNUmakefile.settings
+ SOURCEDIR	= ${CURDIR}
+ include GNUmakefile.settings
  
  #------------------------------------------------------------------------
  # paths & directories
  
  #------------------------------------------------------------------------
  # tools
! LIBFILE		= ${GCCSDK_INSTALL_CROSSBIN}/libfile
  INDEXHELP	= ${BINDIR}/IndexHelp
  BINDHELP	= ${BINDIR}/BindHelp
***************
*** 20,24 ****
  
  #------------------------------------------------------------------------
! #target-specific macros
  
  SOURCES = Computer Core Toolbox User
--- 20,24 ----
  
  #------------------------------------------------------------------------
! # target-specific macros
  
  SOURCES = Computer Core Toolbox User
***************
*** 29,34 ****
  LIST	= OSLib.list
  LIST32	= OSLib32.list
  #------------------------------------------------------------------------
! #targets
  
  .PHONY:	all cstrong Computer Core Toolbox User Test oslib libs clean
--- 29,35 ----
  LIST	= OSLib.list
  LIST32	= OSLib32.list
+ 
  #------------------------------------------------------------------------
! # targets
  
  .PHONY:	all cstrong Computer Core Toolbox User Test oslib libs clean

Index: GNUmakefile.source
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/GNUmakefile.source,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GNUmakefile.source	3 May 2004 15:03:26 -0000	1.2
--- GNUmakefile.source	31 Dec 2005 12:06:31 -0000	1.3
***************
*** 2,6 ****
  # Makefile for to include in oslib source GNUmakefiles
  #
! # SORURCEDIR must be defined by the caller, and must
  # point to the top of the source tree.
  
--- 2,6 ----
  # Makefile for to include in oslib source GNUmakefiles
  #
! # SOURCEDIR must be defined by the caller, and must
  # point to the top of the source tree.
  
***************
*** 9,17 ****
  
  #------------------------------------------------------------------------
- # paths & directories
- BINDIR		= ${SOURCEDIR}/../Bin
- CROSSPATH	= /home/riscos/cross/bin
- 
- #------------------------------------------------------------------------
  #	Source Directories
  
--- 9,12 ----
***************
*** 28,38 ****
  INDEXHELP	= ${BINDIR}/IndexHelp
  BINDHELP	= ${BINDIR}/BindHelp
! CP		= cp -pu
  RM		= rm -f
  DIFF		= diff
! AS		= ${CROSSPATH}/gcc -c -xassembler -Wa,${ASMFLAGS}
! CC		= ${CROSSPATH}/gcc
! LINK		= ${CROSSPATH}/gcc
! LIBFILE		= ${CROSSPATH}/libfile
  
  #------------------------------------------------------------------------
--- 23,33 ----
  INDEXHELP	= ${BINDIR}/IndexHelp
  BINDHELP	= ${BINDIR}/BindHelp
! CP		= cp -p
  RM		= rm -f
  DIFF		= diff
! AS		= ${GCCSDK_INSTALL_CROSSBIN}/gcc -c -xassembler -Wa,${ASMFLAGS}
! CC		= ${GCCSDK_INSTALL_CROSSBIN}/gcc
! LINK		= ${GCCSDK_INSTALL_CROSSBIN}/gcc
! LIBFILE		= ${GCCSDK_INSTALL_CROSSBIN}/libfile
  
  #------------------------------------------------------------------------
***************
*** 56,60 ****
  OSLIB		= ${SOURCEDIR}/OSLib.o
  OSLIB32		= ${SOURCEDIR}/OSLib32.o
- UNIXLIB		= ${CROSSPATH}/bin/arm-riscos-aof/3_3_0/apcs32/arch3/unixlib/unixlib.o
  
  #------------------------------------------------------------------------
--- 51,54 ----
***************
*** 180,184 ****
  .swi.o:		;@echo making $@
  		@if [ ! -d l ]; then mkdir l; fi;
! 		@env PATH=${CROSSPATH}:${PATH} ${MALLOC_CHECK} \
  			${DEFMOD} -l -o l/$* -byte_wide ${BYTEWIDE} < $<
  		@${REDUCEAOF} -via ViaFile
--- 174,178 ----
  .swi.o:		;@echo making $@
  		@if [ ! -d l ]; then mkdir l; fi;
! 		@env PATH=${GCCSDK_INSTALL_CROSSBIN}:${PATH} ${MALLOC_CHECK} \
  			${DEFMOD} -l -o l/$* -byte_wide ${BYTEWIDE} < $<
  		@${REDUCEAOF} -via ViaFile
***************
*** 192,196 ****
  .swi.o32:	;@echo making $@
  		@if [ ! -d l ]; then mkdir l; fi;
! 		@env PATH=${CROSSPATH}:$PATH ${MALLOC_CHECK} \
  			${DEFMOD} -l -o l/$* -byte_wide ${BYTEWIDE} -32bit < $<
  		@${REDUCEAOF} -via ViaFile
--- 186,190 ----
  .swi.o32:	;@echo making $@
  		@if [ ! -d l ]; then mkdir l; fi;
! 		@env PATH=${GCCSDK_INSTALL_CROSSBIN}:$PATH ${MALLOC_CHECK} \
  			${DEFMOD} -l -o l/$* -byte_wide ${BYTEWIDE} -32bit < $<
  		@${REDUCEAOF} -via ViaFile