[ro-oslib-commits] OSLib/!OsLib/Source/Computer/oslib AMUmakefile,1.1,1.2 GNUmakefile,1.1,1.2 Modules,1.1,1.2 .cvsignore,1.5,1.6 ADFS.swi,1.2,1.3 !Clean,fd7,1.3,NONE !Make,fd7,1.6,NONE !copysrc,1.2,NONE Makefile,fe1,1.11,NONE

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

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

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

Index: .cvsignore
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Computer/oslib/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** .cvsignore	29 Dec 2003 11:40:18 -0000	1.5
--- .cvsignore	3 May 2004 15:03:26 -0000	1.6
***************
*** 1,3 ****
- l
  Hdr
  help
--- 1,2 ----
***************
*** 16,21 ****
  *.o
  *.o,*
  *.o32,*
  *.s
  *.s32
! tree,ffd
\ No newline at end of file
--- 15,22 ----
  *.o
  *.o,*
+ *.o32
  *.o32,*
  *.s
  *.s32
! tree
! tree,ffd

--- NEW FILE: AMUmakefile ---
# OSLib.Source.Computer.oslib.Makefile	TV	20031228
# Makefile for Computer/oslib under RISC OS
#

#include the module list
include ${MAKEFILEDIR}.modules

#include the global definitions afther the local ones
# to allow the latter to be recognised
include <OSLib$SourceDir>.AMUmakefile/inc

# local targets
.PHONY:	computer libs libs32

computer:   all
      	    @echo

libs:	    ${LIBS}
      	    @echo

libs32:     ${LIBS32}
      	    @echo


#------------------------------------------------------------------------
# Dynamic dependencies:

Index: ADFS.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Computer/oslib/ADFS.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ADFS.swi	15 Dec 2002 11:35:33 -0000	1.2
--- ADFS.swi	3 May 2004 15:03:26 -0000	1.3
***************
*** 1,5 ****
  TITLE ADFS;
  AUTHOR "Jonathan Coxhead, jon...@do..., 21 Aug 1995";
! 
  NEEDS OS, FileCore;
  
--- 1,5 ----
  TITLE ADFS;
  AUTHOR "Jonathan Coxhead, jon...@do..., 21 Aug 1995";
!  
  NEEDS OS, FileCore;
  

--- !Clean,fd7 DELETED ---

--- !copysrc DELETED ---

--- Makefile,fe1 DELETED ---

--- NEW FILE: GNUmakefile ---
#	OSLib/Source/Computer/oslib/GNUmakefile		TV	20040115
# Makefile for Computer/oslib under GNU
#

SOURCEDIR	= ../..
TARGET		= Computer

include Modules
include ${SOURCEDIR}/GNUmakefile.source
#------------------------------------------------------------------------

.PHONY:	${OSLIB32} ${OSLIB}

${OSLIB}:	${LIBS} ${HDRS} ${OBJS}

${OSLIB32}:	${LIBS32} ${HDRS} ${OBJS32}

--- NEW FILE: Modules ---
# OSLib.Source.Computer.oslib.Modules	TV	20031228
#	List of modules comprising Computer
#	for inclusion in Make files independant of platform

# modules containing SWIs
SWIMODULES += \
ADFS \
CD \
CDFS \
DeviceFS \
DOSFS \
Econet \
FileCore \
Filer \
FilerAction \
FileSwitch \
Free \
Freeway \
FSLock \
Joystick \
NetFS \
NetPrint \
NFS \
OSArgs \
OSFile \
OSFind \
OSFSControl \
OSGBPB \
OSSerialOp \
Parallel \
PipeFS \
RamFS \
Resolver \
ResourceFS \
SCSI \
SCSIFS \
ShareFS \
Socket \
SysLog 

# modules with no SWIs
MODULES += \
CDFSFiler \
NetFiler 

# modules defined other than by SWI definition
CMODULES += 

--- !Make,fd7 DELETED ---