[ro-oslib-commits] OSLib/!OsLib/OSLibSupport AMUmakefile,1.1,1.2 AMUmakefile.source,1.1,1.2 GNUmakefile,1.1,1.2 GNUmakefile.source,1.1,1.2 Make,fd7,1.1,1.2 !Clean,fd7,1.2,NONE !MakeLib,fd7,1.3,NONE Filelist,1.5,NONE Filelist32,1.2,NONE Makefile,fe1,1.9,NONE

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

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

Added Files:
	AMUmakefile AMUmakefile.source GNUmakefile GNUmakefile.source 
	Make,fd7 
Removed Files:
	!Clean,fd7 !MakeLib,fd7 Filelist Filelist32 Makefile,fe1 
Log Message:
merged Unix-Build back into trunk (20040503-1)

--- NEW FILE: AMUmakefile ---
# OSLibSupport/AMUmakefile
# build OSLibSupport under RISC OS
#------------------------------------------------------
MAKE		= amu -desktop
LIBFILE		= libfile
RM		= rm -nq
CP		= copy
COPYFLAGS   	= A~C~DFLN~P~Q~R~S~T~V
MD		= cdir
#ECHO		= @echo $@

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

SOURCES		= Choices_ Err_ Events_ Message_ Task_ trace_ X_
LIBS		= o.OSLibSupport o.OSLibSupport32
FILES		= $(addsuffix .Modules, ${SOURCES} )

HEADERS		= \
Choices \
Err \
Event \
Gadgettypes \
Message \
Systypes \
Task \
Toolboxtypes \
trace \
Wimptypes \
X

include ${FILES}

#------------------------------------------------------
.PHONY:			all clean release ${SOURCES}

all:			${LIBS}

o.OSLibSupport:		${SOURCES}
			${ECHO}
			${MD} ${MAKEFILEDIR}.o
			${LIBFILE} -co ${MAKEFILEDIR}.$@ $(addprefix ${MAKEFILEDIR}.,${AMUMODULES})

o.OSLibSupport32:	${SOURCES}
			${ECHO}
			${MD} ${MAKEFILEDIR}.o
			${LIBFILE} -co ${MAKEFILEDIR}.$@ $(addprefix ${MAKEFILEDIR}.,${AMUMODULES32})

Choices_:	;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
Err_:		;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
Events_:	;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
Message_:	;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
Task_:		;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
trace_:		;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile
X_:		;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile

clean:		;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.Choices_.AMUmakefile clean
		${MAKE} -f ${MAKEFILEDIR}.Err_.AMUmakefile clean
		${MAKE} -f ${MAKEFILEDIR}.Events_.AMUmakefile clean
		${MAKE} -f ${MAKEFILEDIR}.Message_.AMUmakefile clean
		${MAKE} -f ${MAKEFILEDIR}.Task_.AMUmakefile clean
		${MAKE} -f ${MAKEFILEDIR}.trace_.AMUmakefile clean
		${MAKE} -f ${MAKEFILEDIR}.X_.AMUmakefile clean
		${RM} $(addprefix ${MAKEFILEDIR}.,${LIBS} )

distclean:	;${ECHO}
		${MAKE} -f ${MAKEFILEDIR}.Choices_.AMUmakefile distclean
		${MAKE} -f ${MAKEFILEDIR}.Err_.AMUmakefile distclean
		${MAKE} -f ${MAKEFILEDIR}.Events_.AMUmakefile distclean
		${MAKE} -f ${MAKEFILEDIR}.Message_.AMUmakefile distclean
		${MAKE} -f ${MAKEFILEDIR}.Task_.AMUmakefile distclean
		${MAKE} -f ${MAKEFILEDIR}.trace_.AMUmakefile distclean
		${MAKE} -f ${MAKEFILEDIR}.X_.AMUmakefile distclean
		${RM} $(addprefix ${MAKEFILEDIR}., ${LIBS} )
		${RM} $(addprefix ${MAKEFILEDIR}., o )

release:	;${ECHO}
ifndef RELEASEDIR
		error RELEASEDIR not defined
endif
		${MD}	${RELEASEDIR}.OSLibSupport
		${CP}	SetVars	${RELEASEDIR}.OSLibSupport.*	${COPYFLAGS}
		${CP}	Doc	${RELEASEDIR}.OSLibSupport.Doc	${COPYFLAGS}
		${CP} 	h	${RELEASEDIR}.OSLibSupport.h	${COPYFLAGS}
		${CP} 	o	${RELEASEDIR}.OSLibSupport.o	${COPYFLAGS}


--- NEW FILE: GNUmakefile ---
# OSLibSupport/GNUmakefile
# build OSLibSupport under UNIX
#------------------------------------------------------
CROSSPATH	= /home/riscos/cross/bin
LIBFILE		= ${CROSSPATH}/libfile
RM		= rm -f
CP		= cp -pur

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

SOURCES		= Choices_ Err_ Events_ Message_ Task_ trace_ X_
LIBS		= OSLibSupport.o OSLibSupport32.o
FILES		= $(addsuffix /Modules, ${SOURCES} )

HEADERS		= \
Choices \
Err \
Event \
Gadgettypes \
Message \
Systypes \
Task \
Toolboxtypes \
trace \
Wimptypes \
X

include ${FILES}

#------------------------------------------------------
.PHONY:			${SOURCES} all clean release

all:			${LIBS}

OSLibSupport.o:		${SOURCES}
			@if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi;
			${LIBFILE} -i $@ $(addsuffix .o, ${MODULES})

OSLibSupport32.o:	${SOURCES}
			@if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi;
			${LIBFILE} -i $@ $(addsuffix .o32, ${MODULES})

Choices_:	;${MAKE} -C $@
Err_:		;${MAKE} -C $@
Events_:	;${MAKE} -C $@
Message_:	;${MAKE} -C $@
Task_:		;${MAKE} -C $@
trace_:		;${MAKE} -C $@
X_:		;${MAKE} -C $@

clean:		;$(foreach dir, ${SOURCES}, ${MAKE} -C ${dir} clean; )
		-${RM} ${LIBS}

release:	${LIBS}
ifndef RELEASEDIR
		error RELEASEDIR not defined
endif
		@if [ ! -d ${RELEASEDIR} ]; then mkdir -p ${RELEASEDIR}; fi
		${CP}	SetVars,feb	${RELEASEDIR}/
		@if [ ! -d ${RELEASEDIR}/Doc ]; then mkdir -p ${RELEASEDIR}/Doc; fi
		${CP}	Doc/X		${RELEASEDIR}/Doc/X
		@if [ ! -d ${RELEASEDIR}/h ]; then mkdir -p ${RELEASEDIR}/h; fi
		$(foreach file, ${HEADERS}, ${CP} ${file}.h \
			${RELEASEDIR}/h/${file};)
		@if [ ! -d ${RELEASEDIR}/o ]; then mkdir -p ${RELEASEDIR}/o; fi
		$(foreach file, ${LIBS}, ${CP} ${file} \
			${RELEASEDIR}/o/$(basename ${file});)

--- !MakeLib,fd7 DELETED ---

--- NEW FILE: Make,fd7 ---
| OSLibSupport.!MakeLib 20031228
|
wimpslot -min 1024k

echo <sys$time> OSLibSupport.Make %0
AMU -f <Obey$Dir>.AMUmakefile -desktop %0
echo <sys$time>

--- Makefile,fe1 DELETED ---

--- NEW FILE: AMUmakefile.source ---
# OSLibSupport.AMUmakefile/source
# common definitions for building OSLibSupport under RISC OS
#------------------------------------------------------

SOURCEDIR	= <OSLib$SourceDir>
SOURCES_0 	= Computer Core Toolbox User
SOURCES		= ${SOURCES_0} Types Macros

#------------------------------------------------------
CCFLAGS		=
INCLUDES	= ^ OSLib:

#------------------------------------------------------
#Tools
LIBFILE  	= libfile
CC    	 	= cc -c $(CCFLAGS) $(addprefix -I,${INCLUDES}) -throwback
LINK   	 	= link
MV    		= 
RM    	 	= rm -nq
MD		= cdir

#------------------------------------------------------
# targets
OBJS		= $(addprefix o.,${TARGET})
OBJS32		= $(addprefix o32.,${TARGET})

.PHONY:		all clean distclean

all:		${OBJS} ${OBJS32}

clean:		;${RM} ${OBJS} ${OBJS32}

distclean:	clean
		${RM} o o32
		
#------------------------------------------------------
# internal targets:
.SUFFIXES:
.SUFFIXES:  	.o .o32 .c

.c.o:		;@${MD} o
		${CC} -APCS3/26 -o $@ $<

.c.o32:		;@${MD} o32
		${CC} -APCS3/32 -o $@ $<


--- Filelist32 DELETED ---

--- !Clean,fd7 DELETED ---

--- Filelist DELETED ---

--- NEW FILE: GNUmakefile.source ---
# OSLibSupport/GNUmakefile.source
# common definitions for builsing OSLibSupport under UNIX
#------------------------------------------------------

CROSSPATH	= /home/riscos/cross/bin
SOURCEDIR	= ../../Source
SOURCES_0 	= Computer Core Toolbox User
SOURCES		= ${SOURCES_0} Types Macros

#------------------------------------------------------
CCFLAGS		=
INCLUDES	= -I ./ -I../ $(addprefix -I${SOURCEDIR}/, ${SOURCES} )

#------------------------------------------------------
#Tools
LIBFILE  = ${CROSSPATH}/libfile
GCC    	 = ${CROSSPATH}/gcc -c $(CCFLAGS) ${INCLUDES}
LINK   	 = ${CROSSPATH}/gcc
MV    	 = mv -f
RM    	 = rm -f

#------------------------------------------------------
# targets
OBJS		= $(addsuffix .o,${TARGET})
OBJS32		= $(addsuffix .o32,${TARGET})

.PHONY:	all clean

all:	${OBJS} ${OBJS32}

clean:	;-${RM} ${OBJS} ${OBJS32}

#------------------------------------------------------
# internal targets:
.SUFFIXES:
.SUFFIXES:  .o .o32 .c

.c.o:
	${GCC} -mapcs-26 -o $@ $<

.c.o32:
	${GCC} -o $@ $<