[ro-oslib-commits] OSLib/!OsLib GNUmakefile.settings,NONE,1.1 !Readme,1.8,1.9 GNUmakefile,1.6,1.7

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	!Readme GNUmakefile 
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
#

#------------------------------------------------------------------------
# environment settings
GCCSDK_INSTALL_CROSSBIN	?= /home/riscos/cross/bin
GCCSDK_INSTALL_ENV	?= /home/riscos/env

export GCCSDK_INSTALL_CROSSBIN
export GCCSDK_INSTALL_ENV

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

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/GNUmakefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GNUmakefile	13 Mar 2005 13:44:07 -0000	1.6
--- GNUmakefile	31 Dec 2005 12:06:29 -0000	1.7
***************
*** 2,12 ****
  # Makefile for OSLib for UNIX.
  #
- CROSSPATH	= /home/riscos/cross/bin

! HELP		= OSLib,3d6

  #------------------------------------------------------------------------
  #tools
! CP		= cp -pu
  RM		= rm -fr

--- 2,11 ----
  # Makefile for OSLib for UNIX.
  #

! include GNUmakefile.settings

  #------------------------------------------------------------------------
  #tools
! CP		= cp -p
  RM		= rm -fr

***************
*** 19,23 ****
  #targets

! .PHONY: 	${ALL} tools oslib support clean pristine
  .PHONY:		release/wide release/deep release/unix release/help
  .PHONY:		release/OSLibSupport release/unix/OSLibSupport
--- 18,22 ----
  #targets

! .PHONY: 	${ALL} tools oslib support cstrong clean distclean install release
  .PHONY:		release/wide release/deep release/unix release/help
  .PHONY:		release/OSLibSupport release/unix/OSLibSupport
***************
*** 45,48 ****
--- 44,51 ----
  		${RM} release Bin zips dist

+ install:	release/unix
+ 		cd release/unix/OSLib; ${GCCSDK_INSTALL_ENV}/ro-install OSLib32.o ${GCCSDK_INSTALL_ENV}/lib/libOSLib32.o
+ 		cd release/unix/OSLib; ${GCCSDK_INSTALL_ENV}/ro-install -d oslib ${GCCSDK_INSTALL_ENV}/include
+ 
  release:	release_wide \
  		release_deep \
***************
*** 117,121 ****
  release/help:	cstrong
  		@if [ ! -d $@ ]; then mkdir -p $@; fi
! 		@${CP}	Source/${HELP}	$@/

  release_support:	release/OSLibSupport
--- 120,124 ----
  release/help:	cstrong
  		@if [ ! -d $@ ]; then mkdir -p $@; fi
! 		@${CP}	Source/OSLib,3d6	$@/

  release_support:	release/OSLibSupport

Index: !Readme
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/!Readme,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** !Readme	8 Jul 2004 11:17:39 -0000	1.8
--- !Readme	31 Dec 2005 12:06:28 -0000	1.9
***************
*** 1,3 ****
! !OSLib.!Readme  20021121

  ******************************************************************************
--- 1,3 ----
! !OSLib.!Readme  20051231

  ******************************************************************************
***************
*** 109,122 ****
    -------------------------------

!   Building under Linux is possible with the support of the GCCSDK,  which can
! be found  at <http://gccsdk.riscos.info/>. You'll  need at least  3.3.3-pre2.
! Build and install it  as appropriate. OSLib assumes the default  location for
! the binaries, i.e. /home/riscos/.

!   Otherwise, building under LINUX is very similar to building  under RISC OS.
! In  a terminal, in the  appropriate directory, type "Make  all", and watch it
! all happen by magic. It all happens in 10 minutes  on my 1.1 GHz Linux box; a
! vast improvement over  the 2 hours or  more under RISC OS.  Again "make dist"
! and  "make distclean"  work  very much  as  expected. Dig  around inside  the
  GNUmakefiles for other less-useful targets.

--- 109,121 ----
    -------------------------------

!   Building under Linux is possible with the support of the GCCSDK, which can
! be found at <http://gccsdk.riscos.info/>. You'll need at least GCCSDK
! 3.4.5 Release 1.

!   Otherwise, building under LINUX is very similar to building under RISC OS.
! In a terminal, in the appropriate directory, type "make all", and watch it
! all happen by magic. It all happens in 10 minutes on my 1.1 GHz Linux box; a
! vast improvement over the 2 hours or more under RISC OS. Again "make dist"
! and "make distclean" work very much as expected. Dig around inside the
  GNUmakefiles for other less-useful targets.