[ro-oslib-commits] OSLib/!OsLib/OSLibSupport/Choices_ AMUmakefile,1.1,1.2 GNUmakefile,1.1,1.2 Modules,1.1,1.2 .cvsignore,1.3,1.4 !Clean,fd7,1.2,NONE !Make,fd7,1.4,NONE Makefile,fe1,1.12,NONE

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

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

Modified Files:
	.cvsignore 
Added Files:
	AMUmakefile GNUmakefile Modules 
Removed Files:
	!Clean,fd7 !Make,fd7 Makefile,fe1 
Log Message:
merged Unix-Build back into trunk (20040503-1)

Index: .cvsignore
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/Choices_/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	27 Nov 2002 22:10:57 -0000	1.3
--- .cvsignore	3 May 2004 15:03:22 -0000	1.4
***************
*** 1,5 ****
  o
  o32
  obj
  obj32
! .directory
\ No newline at end of file
--- 1,7 ----
  o
  o32
+ *.o
+ *.o32
  obj
  obj32
! .directory

--- NEW FILE: AMUmakefile ---
# OSLibSupport/Choices_/AMUmakefile
# build OSLibSupport/Choices_ under RISC OS
#------------------------------------------------------
include Modules
include ^.AMUmakefile/source
#------------------------------------------------------
--- !Make,fd7 DELETED ---

--- !Clean,fd7 DELETED ---

--- Makefile,fe1 DELETED ---

--- NEW FILE: GNUmakefile ---
# OSLibSupport/Choices_/GNUmakefile
# build OSLibSupport/Choices_ under UNIX
#------------------------------------------------------
include Modules
include ../GNUmakefile.source
#------------------------------------------------------
--- NEW FILE: Modules ---
# OSLibSupport/Choices_/Modules
#------------------------------------------------------
TARGET		:= Choices
DIR		:= Choices_

CHOICES_TARGET	:= ${TARGET}
CHOICES_DIR	:= ${DIR}
GNUMODULES	+= $(addsuffix .o, $(addprefix ${_DIR}/, ${_TARGET}))
GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${CHOICES_DIR}/, ${CHOICES_TARGET}))
AMUMODULES	+= $(addprefix ${CHOICES_DIR}.o., ${CHOICES_TARGET})
AMUMODULES32	+= $(addprefix ${CHOICES_DIR}.o32., ${CHOICES_TARGET})