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

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

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

Modified Files:
	.cvsignore 
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/User/oslib/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .cvsignore	31 Dec 2003 14:42:40 -0000	1.6
--- .cvsignore	3 May 2004 15:03:30 -0000	1.7
***************
*** 17,20 ****
--- 17,21 ----
  *.o
  *.o,*
+ *.o32
  *.o32,*
  *.s

--- NEW FILE: AMUmakefile ---
# 	Index: OSLib/!OsLib/Source/User/oslib/Makefile,fe1		20031228
#

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:	user libs libs32

user:       all
      	    @echo

libs:	    ${LIBS}
      	    @echo

libs32:     ${LIBS32}
      	    @echo


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

--- !Make,fd7 DELETED ---

--- !Clean,fd7 DELETED ---

--- !copysrc DELETED ---

--- Makefile,fe1 DELETED ---

--- NEW FILE: GNUmakefile ---
#	OSLib/Source/User/oslib/GNUmakefile		TV	20040120
# Makefile for User/oslib under GNU
#

SOURCEDIR 	= ../..
TARGET		= User

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

.PHONY:	${OSLIB32} ${OSLIB}

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

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

--- NEW FILE: Modules ---
#	OSLib/Source/User/oslub/Modules
# 	Module definition file for User Make

# modules containing SWIs
SWIMODULES += \
BASICTrans \
ColourPicker \
CompressJPEG \
ConvertPNG \
DragASprite \
Draw \
DrawFile \
Filter \
Font \
Hourglass \
ImageFileRender \
JPEG \
MimeMap \
PDriver \
PDumper \
Report \
TaskManager \
TaskWindow \
URI \
URL \
Wimp \
WimpExtend \
WimpReadSysInfo \
WimpSpriteOp \
Zipper \
ZLib 

# modules with no SWIs
MODULES += \
Alarm \
Arcweb \
ExtEdit \
Help \
InetSuite \
MakePSFont \
OLE \
PlugIn \
RemotePrinterSupport \
StrongHelp \
Super 

# modules defined other than by SWI definition
CMODULES +=