[ro-oslib-commits] OSLib/!OsLib/Source/Toolbox/oslib AMUmakefile,1.1,1.2 GNUmakefile,1.1,1.2 Modules,1.1,1.2 .cvsignore,1.5,1.6 !Clean,fd7,1.2,NONE !Make,fd7,1.4,NONE !copysrc,1.2,NONE Makefile,fe1,1.10,NONE

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

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Toolbox/oslib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Source/Toolbox/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/Toolbox/oslib/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** .cvsignore	31 Dec 2003 14:42:39 -0000	1.5
--- .cvsignore	3 May 2004 15:03:30 -0000	1.6
***************
*** 1,3 ****
- l
  Hdr
  help
--- 1,2 ----
***************
*** 16,19 ****
--- 15,19 ----
  *.o
  *.o,*
+ *.o32
  *.o32,*
  *.s

--- NEW FILE: AMUmakefile ---
# Index: OSLib/!OsLib/Source/Toolbox/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:	tbox libs libs32

tbox:       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/Toolbox/oslib/GNUmakefile		TV	20040120
# Makefile for Computer/oslib under GNU
#

SOURCEDIR 	= ../..
TARGET		= Toolbox

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

.PHONY:	${OSLIB32} ${OSLIB}

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

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

--- NEW FILE: Modules ---
#	OSLib/Source/Toolbox/oslib/Modules
# Modules definition for Toolbox Make

# modules containing SWIs
SWIMODULES += \
ActionButton \
Button \
ColourDbox \
ColourMenu \
DCS \
DDEUtils \
DisplayField \
DragAnObject \
Draggable \
FileInfo \
FontDbox \
FontMenu \
FrontEnd \
Gadget \
Iconbar \
Menu \
NumberRange \
OptionButton \
PopUp \
PrintDbox \
ProgInfo \
Quit \
RadioButton \
SaveAs \
Scale \
Scrollbar \
ScrollList \
Slider \
StringSet \
TextArea \
TextGadgets \
ToolAction \
Toolbox \
Window \
WindowSupportExternal \
WritableField 

# modules with no SWIs
MODULES += \
Adjuster \
FileDbox \
KeyboardShortcut \
Label \
LabelledBox \
ResEd 

# modules defined other than by SWI definition
CMODULES +=