[ro-oslib-commits] SF.net SVN: ro-oslib: [268] branches/simplified-build/!OsLib

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 268
          http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=268&view=rev
Author:   jtytgat
Date:     2007-05-06 16:43:12 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Added OSLibSupport back in the build.

Modified Paths:
--------------
    branches/simplified-build/!OsLib/Makefile
    branches/simplified-build/!OsLib/Source/Makefile
    branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
    branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
    branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/Modules
    branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/Modules
    branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Modules
    branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Modules
    branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Modules
    branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Modules
    branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Modules
    branches/simplified-build/!OsLib/Source/Test/Test/Makefile

Added Paths:
-----------
    branches/simplified-build/!OsLib/Source/OSLibSupport/
    branches/simplified-build/!OsLib/Source/SetVars,feb

Removed Paths:
-------------
    branches/simplified-build/!OsLib/OSLibSupport/
    branches/simplified-build/!OsLib/Source/Clean,fd7
    branches/simplified-build/!OsLib/Source/Make,fd7
    branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile.source
    branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Make,fd7
    branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile.source
    branches/simplified-build/!OsLib/Source/OSLibSupport/Make,fd7
    branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Make,fd7
    branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Make,fd7
    branches/simplified-build/!OsLib/Source/OSLibSupport/X_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/X_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Make,fd7
    branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/AMUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/GNUmakefile
    branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Make,fd7
    branches/simplified-build/!OsLib/Source/SetVarsRO4,feb

Modified: branches/simplified-build/!OsLib/Makefile
===================================================================

--- branches/simplified-build/!OsLib/Makefile	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Makefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -19,16 +19,20 @@
 oslib-aof: Tools
 	$(MAKE) -C Source clean
 	$(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_AOF
+	$(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_AOF
 
 oslib-aof-n-release: oslib-aof
 	$(MAKE) -C Source release-oslib BUILDTYPE=CROSSGCC_AOF
+	$(MAKE) -C Source release-oslibsupport BUILDTYPE=CROSSGCC_AOF
 
 oslib-elf: Tools
 	$(MAKE) -C Source clean
 	$(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF
+	$(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF
 
 oslib-elf-n-release: oslib-elf
 	$(MAKE) -C Source release-oslib BUILDTYPE=CROSSGCC_ELF
+	$(MAKE) -C Source release-oslibsupport BUILDTYPE=CROSSGCC_ELF
 
 cstrong: Tools
 	$(MAKE) -C Source cstrong

Deleted: branches/simplified-build/!OsLib/Source/Clean,fd7
===================================================================
--- branches/simplified-build/!OsLib/Source/Clean,fd7	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Clean,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-| OSLib.Source.Clean
-|
-AMU -f <Obey$Dir>.Makefile -desktop clean

Deleted: branches/simplified-build/!OsLib/Source/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/Source/Make,fd7	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-Echo <sys$Time> !OSLib.Source.AMUmakefile %0
-|
-WIMPSlot -min 4096K
-if "<C$MODE>" = "32" then do AMU -f <Obey$Dir>.AMUmakefile -desktop %0 APCS=32
-if "<C$MODE>"<> "32" then do AMU -f <Obey$Dir>.AMUmakefile -desktop %0 APCS=26
-echo <Sys$Time> Done
\ No newline at end of file

Modified: branches/simplified-build/!OsLib/Source/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Makefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -10,33 +10,45 @@
 endif
 include Makefile.setup.$(BUILDTYPE)
 
-.PHONY: all install release-oslib release-cstrong clean oslib cstrong BuildRequirements
-all:	oslib cstrong
+.PHONY: all install release-oslib release-oslibsupport release-cstrong clean oslib oslibsupport cstrong BuildRequirements
+all:	oslib cstrong oslibsupport
 
 test:	oslib
 	$(MAKE) -C Test
 
-# Only for GCCSDK cross-compilation install purposes:
+# Only for GCCSDK Autobuilder cross-compilation install purposes:
 install: oslib
 	cd $(BUILDDIR) && $(INSTALL) OSLib32.o $(GCCSDK_INSTALL_ENV)/lib/libOSLib32.o
 	cd $(HEADERDIR) && $(INSTALL) *.h *.Hdr $(GCCSDK_INSTALL_ENV)/include/oslib
 
-# Sanity test and if successful then zips the library & headers (Unix and RISC OS 'wide' distribution):
+# Sanity test and if successful then zips the OSLib library & its headers (Unix and RISC OS 'wide' distribution):
 release-oslib: test
 	-$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
 	-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip
-	cd $(HEADERDIR)/.. && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip oslib
+	cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip oslib
 	cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip OSLib32.o
+	$(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-unix.zip SetVars,feb
 	-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip
-	-$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(HEADERDIR)/../o
+	-$(MKDIR) $(HEADERDIR)/h $(HEADERDIR)/Hdr $(TOPHEADERDIR)/o
 	cd $(HEADERDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
-	$(CP) $(OSLIBLIB) $(HEADERDIR)/../o/OSLib32
-	cd $(HEADERDIR)/.. && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
+	$(CP) $(OSLIBLIB) $(TOPHEADERDIR)/o/OSLib32
+	cd $(TOPHEADERDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip .
+	$(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLib-wide.zip SetVars,feb
 
+# Zips the OSLibSupport library & its headers (Unix and RISC OS distribution):
+release-oslibsupport: oslibsupport
+	-$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
+	-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport-unix.zip
+	cd $(OSLIBSUPPORTDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport-unix.zip .
+	-$(RM) $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport.zip
+	-$(MKDIR) $(OSLIBSUPPORTDIR)/h $(OSLIBSUPPORTDIR)/o
+	cd $(OSLIBSUPPORTDIR) && find . -type f -exec rename 's/(.+)\.(.+)/$$2\/$$1/' {} \;
+	cd $(OSLIBSUPPORTDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibSupport.zip .
+
 # Zips the StrongHelp file:
 release-cstrong:
 	$(MKDIR) $(RELEASEDIR)/$(BUILDTYPE)
-	cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibStrongHelp $(OSLIBCSTRONG)
+	cd $(BUILDDIR) && $(GCCSDK_INSTALL_CROSSBIN)/zip -, -9r $(RELEASEDIR)/$(BUILDTYPE)/OSLibStrongHelp $(notdir $(OSLIBCSTRONG))
 
 clean:
 	$(MAKE) -C Types/oslib $@
@@ -58,6 +70,9 @@
 	$(MAKE) -C User/oslib oslib
 	cd $(OBJDIR) && $(LIBFILE) $@ */*.o
 
+oslibsupport: $(OSLIBLIB)
+	$(MAKE) -C OSLibSupport
+
 cstrong: $(OSLIBCSTRONG)
 $(OSLIBCSTRONG): BuildRequirements
 	$(MAKE) -C Types/oslib cstrong

Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_AOF	2007-05-06 23:43:12 UTC (rev 268)
@@ -17,6 +17,7 @@
 export CSTRONGDIR := $(BUILDDIR)/CStrong
 export OBJDIR := $(BUILDDIR)/Objs
 export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
+export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport
 
 export BYTEWIDE := $(SOURCEDIR)/ByteWide
 export DEFMOD := $(BINDIR)/defmod -asmtype gccaof

Modified: branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF
===================================================================
--- branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Makefile.setup.CROSSGCC_ELF	2007-05-06 23:43:12 UTC (rev 268)
@@ -17,6 +17,7 @@
 export CSTRONGDIR := $(BUILDDIR)/CStrong
 export OBJDIR := $(BUILDDIR)/Objs
 export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
+export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport
 
 export BYTEWIDE := $(SOURCEDIR)/ByteWide
 export DEFMOD := $(BINDIR)/defmod -asmtype gccelf

Copied: branches/simplified-build/!OsLib/Source/OSLibSupport (from rev 246, branches/simplified-build/!OsLib/OSLibSupport)

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,93 +0,0 @@
-# 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}
-

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile.source
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/AMUmakefile.source	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/AMUmakefile.source	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,46 +0,0 @@
-# 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 $@ $<
-

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Choices_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Choices_/AMUmakefile
-# build OSLibSupport/Choices_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
-#------------------------------------------------------
\ No newline at end of file

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Choices_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Choices_/GNUmakefile
-# build OSLibSupport/Choices_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
-#------------------------------------------------------
\ No newline at end of file

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Choices_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Choices_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,11 +1 @@
-# 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})
+OBJS += Choices_/Choices.o

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Err_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport.Err_.AMUmakefile
-# build OSLibSupport/Err_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
-#------------------------------------------------------
\ No newline at end of file

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Err_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Err_/GNUmakefile
-# build OSLibSupport/Err_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
-#------------------------------------------------------
\ No newline at end of file

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Err_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Err_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Err_/Modules
-#------------------------------------------------------
-TARGET		:= Nomem Oserror Reporterr
-DIR		:= Err_
-
-ERR_TARGET	:= ${TARGET}
-ERR_DIR		:= ${DIR}
-GNUMODULES	+= $(addsuffix .o, $(addprefix ${ERR_DIR}/, ${ERR_TARGET}))
-GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${ERR_DIR}/, ${ERR_TARGET}))
-AMUMODULES	+= $(addprefix ${ERR_DIR}.o., ${ERR_TARGET})
-AMUMODULES32	+= $(addprefix ${ERR_DIR}.o32., ${ERR_TARGET})
-#------------------------------------------------------
+OBJS += Err_/Nomem.o Err_/Oserror.o Err_/Reporterr.o

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport.Events_.GNUmakefile
-# build OSLibSupport/Events_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source
-#------------------------------------------------------
\ No newline at end of file

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Events_/GNUmakefile
-# build OSLibSupport/Events_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source
-#------------------------------------------------------
\ No newline at end of file

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/Make,fd7	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time> 
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Events_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Events_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Events_/Modules
-#------------------------------------------------------
-TARGET		:= Tbevent Wimpevent Wimpmsg Event
-DIR		:= Events_
-
-EVENTS_TARGET	:= ${TARGET}
-EVENTS_DIR	:= ${DIR}
-GNUMODULES	+= $(addsuffix .o, $(addprefix ${EVENTS_DIR}/, ${EVENTS_TARGET}))
-GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${EVENTS_DIR}/, ${EVENTS_TARGET}))
-AMUMODULES	+= $(addprefix ${EVENTS_DIR}.o., ${EVENTS_TARGET})
-AMUMODULES32	+= $(addprefix ${EVENTS_DIR}.o32., ${EVENTS_TARGET})
-#------------------------------------------------------
+OBJS += Events_/Tbevent.o Events_/Wimpevent.o Events_/Wimpmsg.o Events_/Event.o

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,85 +0,0 @@
-# OSLibSupport/GNUmakefile
-# build OSLibSupport under UNIX
-
-#------------------------------------------------------
-include ../GNUmakefile.settings
-
-#------------------------------------------------------
-LIBFILE		= ${GCCSDK_INSTALL_CROSSBIN}/libfile
-RM		= rm -f
-CP		= cp -pr
-
-#------------------------------------------------------
-
-SOURCES		= Choices_ Err_ Events_ Message_ Task_ trace_ X_
-#LIBS		= OSLibSupport.o OSLibSupport32.o
-LIBS		= 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}
-
-# we no longer biild the 26 bit library, as GCCSDK won't support it
-#OSLibSupport.o:		${SOURCES}
-#			@if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi;
-#			${LIBFILE} -i $@ ${GNUMODULES}
-
-OSLibSupport32.o:	${SOURCES}
-			@if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi;
-			${LIBFILE} -i $@ ${GNUMODULES32}
-
-#Choices_:	;${MAKE} -C $@
-#Err_:		;${MAKE} -C $@
-#Events_:	;${MAKE} -C $@
-#Message_:	;${MAKE} -C $@
-#Task_:		;${MAKE} -C $@
-#trace_:		;${MAKE} -C $@
-#X_:		;${MAKE} -C $@
-
-${SOURCES}:	;${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});)
-
-release_unix:	${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
-		$(foreach file, ${HEADERS}, ${CP} ${file}.h ${RELEASEDIR};)
-		$(foreach file, ${LIBS}, ${CP} ${file} ${RELEASEDIR};)

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile.source
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/GNUmakefile.source	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/GNUmakefile.source	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,44 +0,0 @@
-# OSLibSupport/GNUmakefile.source
-# common definitions for builsing OSLibSupport under UNIX
-#------------------------------------------------------
-
-SOURCEDIR	= ../../Source
-SOURCES_0 	= Computer Core Toolbox User
-SOURCES		= ${SOURCES_0} Types Macros
-
-#------------------------------------------------------
-CCFLAGS		=
-INCLUDES	= -I ./ -I../ $(addprefix -I${SOURCEDIR}/, ${SOURCES} )
-
-#------------------------------------------------------
-#Tools
-LIBFILE  = ${GCCSDK_INSTALL_CROSSBIN}/libfile
-GCC    	 = ${GCCSDK_INSTALL_CROSSBIN}/gcc -c $(CCFLAGS) ${INCLUDES}
-LINK   	 = ${GCCSDK_INSTALL_CROSSBIN}/gcc
-MV    	 = mv -f
-RM    	 = rm -f
-
-#------------------------------------------------------
-# targets
-#OBJS		= $(addsuffix .o,${TARGET})
-OBJS32		= $(addsuffix .o32,${TARGET})
-
-.PHONY:	all clean
-
-#all:	${OBJS} ${OBJS32}
-all:	${OBJS32}
-
-clean:	;-${RM} ${OBJS} ${OBJS32}
-
-#------------------------------------------------------
-# internal targets:
-.SUFFIXES:
-.SUFFIXES:  .o .o32 .c
-
-# GCC no longer supports 26 bit model
-#.c.o:
-#	${GCC} -mapcs-26 -o $@ $<
-
-%o32 : %c
-	${GCC} -o $@ $<
-

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Make,fd7	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,7 +0,0 @@
-| OSLibSupport.!MakeLib 20031228
-|
-wimpslot -min 1024k
-
-echo <sys$time> OSLibSupport.Make %0
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,8 +0,0 @@
-# OSLibSupport.Message_.GNUmakefile
-# build OSLibSupport.Message_ under RISC OS
-
-#------------------------------------------------------
-TARGET		= Message
-
-#------------------------------------------------------
-include ^.AMUmakefile/source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,8 +0,0 @@
-# OSLibSupport/Message_/GNUmakefile
-# build OSLibSupport/Message_ under UNIX
-
-#------------------------------------------------------
-TARGET		= Message
-
-#------------------------------------------------------
-include ../GNUmakefile.source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/Make,fd7	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Message_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Message_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Message_/Modules
-#------------------------------------------------------
-TARGET		:= Message
-DIR		:= Message_
-
-MESSAGE_TARGET	:= ${TARGET}
-MESSAGE_DIR	:= ${DIR}
-GNUMODULES	+= $(addsuffix .o, $(addprefix ${MESSAGE_DIR}/, ${MESSAGE_TARGET}))
-GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${MESSAGE_DIR}/, ${MESSAGE_TARGET}))
-AMUMODULES	+= $(addprefix ${MESSAGE_DIR}.o., ${MESSAGE_TARGET})
-AMUMODULES32	+= $(addprefix ${MESSAGE_DIR}.o32., ${MESSAGE_TARGET})
-#------------------------------------------------------
+OBJS += Message_/Message.o

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport.Task_.AMUmakefile
-# build OSLibSupport.Task under RISC OS
-
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,6 +0,0 @@
-# OSLibSupport/Task_/GNUmakefile
-# build OSLibSupport/Task under UNIX
-
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/Make,fd7	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/Task_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/Task_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/Task_/Modules
-#------------------------------------------------------
-TARGET		:= Taskgetname
-DIR		:= Task_
-
-TASK_TARGET	:= ${TARGET}
-TASK_DIR	:= ${DIR}
-GNUMODULES	+= $(addsuffix .o, $(addprefix ${TASK_DIR}/, ${TASK_TARGET}))
-GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${TASK_DIR}/, ${TASK_TARGET}))
-AMUMODULES	+= $(addprefix ${TASK_DIR}.o., ${TASK_TARGET})
-AMUMODULES32	+= $(addprefix ${TASK_DIR}.o32., ${TASK_TARGET})
-#------------------------------------------------------
+OBJS += Task_/Taskgetname.o

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport.X_.GNUmakefile
-# build OSLibSupport.X_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport/X_/GNUmakefile
-# build OSLibSupport/X_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/Make,fd7	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -D -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/X_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/X_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/X_/Modules
-#------------------------------------------------------
-TARGET		:= X
-DIR		:= X_
-
-X_TARGET	:= ${TARGET}
-X_DIR		:= ${DIR}
-GNUMODULES	+= $(addsuffix .o, $(addprefix ${X_DIR}/, ${X_TARGET}))
-GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${X_DIR}/, ${X_TARGET}))
-AMUMODULES	+= $(addprefix ${X_DIR}.o., ${X_TARGET})
-AMUMODULES32	+= $(addprefix ${X_DIR}.o32., ${X_TARGET})
-#------------------------------------------------------
+OBJS += X_/X.o

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/AMUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/AMUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport.trace_.AMUmakefile
-# build OSLibSupport.trace_ under RISC OS
-#------------------------------------------------------
-include Modules
-include ^.AMUmakefile/source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/GNUmakefile	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/GNUmakefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,5 +0,0 @@
-# OSLibSupport/trace_/GNUmakefile
-# build OSLibSupport/trace_ under UNIX
-#------------------------------------------------------
-include Modules
-include ../GNUmakefile.source

Deleted: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/Make,fd7	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Make,fd7	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,3 +0,0 @@
-echo <sys$time>
-AMU -D -f <Obey$Dir>.AMUmakefile -desktop %0
-echo <sys$time>

Modified: branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Modules
===================================================================
--- branches/simplified-build/!OsLib/OSLibSupport/trace_/Modules	2007-04-15 12:42:37 UTC (rev 246)
+++ branches/simplified-build/!OsLib/Source/OSLibSupport/trace_/Modules	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,12 +1 @@
-# OSLibSupport/trace_/Modules
-#------------------------------------------------------
-TARGET		:= trace
-DIR		:= trace_
-
-TRACE_TARGET	:= ${TARGET}
-TRACE_DIR	:= ${DIR}
-GNUMODULES	+= $(addsuffix .o, $(addprefix ${TRACE_DIR}/, ${TRACE_TARGET}))
-GNUMODULES32	+= $(addsuffix .o32, $(addprefix ${TRACE_DIR}/, ${TRACE_TARGET}))
-AMUMODULES	+= $(addprefix ${TRACE_DIR}.o., ${TRACE_TARGET})
-AMUMODULES32	+= $(addprefix ${TRACE_DIR}.o32., ${TRACE_TARGET})
-#------------------------------------------------------
+OBJS += trace_/trace.o

Copied: branches/simplified-build/!OsLib/Source/SetVars,feb (from rev 246, branches/simplified-build/!OsLib/Source/SetVarsRO4,feb)
===================================================================
--- branches/simplified-build/!OsLib/Source/SetVars,feb	                        (rev 0)
+++ branches/simplified-build/!OsLib/Source/SetVars,feb	2007-05-06 23:43:12 UTC (rev 268)
@@ -0,0 +1,7 @@
+| OSLib's SetVars
+| Sets the directory and path variables for OSLib.
+Set OSLib$Dir <Obey$Dir>
+
+| The OSLib: path is the presently preferred style for include files;
+| You always need to use this as the link path.
+Set OSLib$Path <OSLib$Dir>.

Deleted: branches/simplified-build/!OsLib/Source/SetVarsRO4,feb
===================================================================
--- branches/simplified-build/!OsLib/Source/SetVarsRO4,feb	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/SetVarsRO4,feb	2007-05-06 23:43:12 UTC (rev 268)
@@ -1,11 +0,0 @@
-| OSLib.SetVarsRO4 20040215
-| Sets the directory and path variables for OSLib when using the 'wide' directory structure
-| This need not actually be RO4, but could be held by any FS with > 77 files per directory.
-Set OSLib$Dir <Obey$Dir>
-
-| The OSLib: path is the presently preferred style for include files;\xA0
-|  You always need to use this as the link path.
-Set OSLib$Path <OSLib$Dir>.
-
-| The OSLibInclude: path is provided for backwards compatibility.
-Set OSLibInclude$Path <OSLib$Dir>.oslib.

Modified: branches/simplified-build/!OsLib/Source/Test/Test/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Source/Test/Test/Makefile	2007-05-06 16:43:18 UTC (rev 267)
+++ branches/simplified-build/!OsLib/Source/Test/Test/Makefile	2007-05-06 23:43:12 UTC (rev 268)
@@ -8,7 +8,7 @@
 all: test_c test_cpp test_s
 
 clean:
-	-$(RM) test_c test_cpp test_s all_oslib.h all_oslib.Hdr
+	-$(RM) test_c test_cpp test_s small_test.o all_oslib.h all_oslib.Hdr
 
 test_c: test.c small_test.o all_oslib.h
 	$(CC) -o $@ -I$(TOPHEADERDIR) test.c small_test.o $(OSLIBLIB)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


