Menu
▾
▴
[ro-oslib-commits] SF.net SVN: ro-oslib: [256] branches/simplified-build/!OsLib/Tools
|
From: <jt...@us...> - 2007-04-29 22:03:35
|
Revision: 256
http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=256&view=rev
Author: jtytgat
Date: 2007-04-29 15:03:34 -0700 (Sun, 29 Apr 2007)
Log Message:
-----------
Tools Makefile cleanup including working 'clean' target.
Modified Paths:
--------------
branches/simplified-build/!OsLib/Tools/BindHelp/Makefile
branches/simplified-build/!OsLib/Tools/DefMod2/Makefile
branches/simplified-build/!OsLib/Tools/IndexHelp/Makefile
branches/simplified-build/!OsLib/Tools/ReduceAOF/Makefile
Added Paths:
-----------
branches/simplified-build/!OsLib/Tools/Makefile
Removed Paths:
-------------
branches/simplified-build/!OsLib/Tools/AMUmakefile
branches/simplified-build/!OsLib/Tools/AMUmakefile.source
branches/simplified-build/!OsLib/Tools/GNUmakefile
branches/simplified-build/!OsLib/Tools/GNUmakefile.source
branches/simplified-build/!OsLib/Tools/Make,fd7
branches/simplified-build/!OsLib/Tools/Makefile,fe1
Deleted: branches/simplified-build/!OsLib/Tools/AMUmakefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/AMUmakefile 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/AMUmakefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -1,53 +0,0 @@
-# Index: OSLib/!OsLib/Tools/AMUmakefile 20040225
-#===================================================================
-#
-DIR = ${MAKEFILEDIR}
-COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V
-
-RM = rm -nq
-MAKE = amu -desktop
-
-# build all tools
-all: stage2 stage1
- @echo
-
-
-# build tools which don't depend on OSLib
-stage1:
-ifndef APCS
- $(error APCS mode is undefined)
-endif
- ${MAKE} -f ${DIR}.bison.AMUmakefile all APCS=${APCS}
- ${MAKE} -f ${DIR}.DefMod2.AMUmakefile all APCS=${APCS}
- ${MAKE} -f ${DIR}.ReduceAOF.AMUmakefile all APCS=${APCS}
- ${MAKE} -f ${DIR}.Rm.AMUmakefile all APCS=${APCS}
- ${MAKE} -f ${DIR}.ToLower.AMUmakefile all APCS=${APCS}
-
-# build tools which depend on OSLib
-stage2:
-ifndef APCS
- $(error APCS mode is undefined)
-endif
- ${MAKE} -f ${DIR}.BindHelp.AMUmakefile all APCS=${APCS}
- ${MAKE} -f ${DIR}.IndexHelp.AMUmakefile all APCS=${APCS}
- ${MAKE} -f ${DIR}.StripDepends.AMUmakefile all APCS=${APCS}
-
-clean:
- ${MAKE} -f ${DIR}.BindHelp.AMUmakefile clean
- ${MAKE} -f ${DIR}.DefMod2.AMUmakefile clean
- ${MAKE} -f ${DIR}.IndexHelp.AMUmakefile clean
- ${MAKE} -f ${DIR}.ReduceAOF.AMUmakefile clean
- ${MAKE} -f ${DIR}.Rm.AMUmakefile clean
- ${MAKE} -f ${DIR}.StripDepends.AMUmakefile clean
- ${MAKE} -f ${DIR}.bison.AMUmakefile clean
- ${MAKE} -f ${DIR}.ToLower.AMUmakefile clean
-
-distclean:
- ${MAKE} -f ${DIR}.BindHelp.AMUmakefile distclean
- ${MAKE} -f ${DIR}.DefMod2.AMUmakefile distclean
- ${MAKE} -f ${DIR}.IndexHelp.AMUmakefile distclean
- ${MAKE} -f ${DIR}.ReduceAOF.AMUmakefile distclean
- ${MAKE} -f ${DIR}.Rm.AMUmakefile distclean
- ${MAKE} -f ${DIR}.StripDepends.AMUmakefile distclean
- ${MAKE} -f ${DIR}.bison.AMUmakefile distclean
- ${MAKE} -f ${DIR}.ToLower.AMUmakefile distclean
Deleted: branches/simplified-build/!OsLib/Tools/AMUmakefile.source
===================================================================
--- branches/simplified-build/!OsLib/Tools/AMUmakefile.source 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/AMUmakefile.source 2007-04-29 22:03:34 UTC (rev 256)
@@ -1,113 +0,0 @@
-#
-# Include Makefile for Tools under RISC OS.
-#
-# caller must define TARGET, MODULES, INCLUDES
-# caller may define DEFINES, VPATH
-
-#TARGET =
-#MODULES =
-#INCLUDES =
-#DEFINES =
-#VPATH =
-#LIBS =
-#CLIST ?= -list
-
-DEBUG ?= 0
-TRACE ?= 0
-
-ALL ?= ${TARGET}
-BINDIR ?= <OSLib$BinDir>
-#------------------------------------------------------------------------
-#tools
-
-MAKE = amu -desktop -D
-CC = \
-cc -c ${THROWBACK} \
-$(addprefix -f, ${CFLAGS}) \
-$(addprefix -W, ${CWARN} ) \
-$(addprefix -I, ${INCLUDES}) \
-$(addprefix -D, ${DEFINES} ) \
-${DEPEND} \
-${CLIST} \
--apcs 3/${APCS}
-
-CFLAGS = af
-CWARN = cp
-#DEPEND = -depend !Depend
-THROWBACK = -throwback
-
-ifeq (${APCS},32)
-OSLIB =OSLib32
-SUPPORT = OSLibSupport32
-else
-OSLIB =OSLib
-SUPPORT = OSLibSupport
-endif
-
-ifneq (${DEBUG},0)
-DEFINES += DEBUG=${DEBUG}
-endif
-
-ifneq (${TRACE},0)
-DEFINES += TRACE=${TRACE}
-endif
-
-ASM = \
-OBJASM $(addprefix -I, ${ASMINCLUDES}) \
-${ASMOPTIONS} ${DEPEND} -stamp -quit -throwback
-
-LD = link
-LDFLAGS =
-
-CP = copy
-copyflags = A~C~DFLN~P~QR~S~T~V
-
-MD = cdir
-RM = rm -nq
-STRIP = StripDepends
-
-#------------------------------------------------------------------------
-#macros
-OBJS = $(addprefix o.,${MODULES})
-TRACEOBJS = $(addprefix o.,${TRACEMODULES})
-
-ifneq (${TRACE},0)
-OBJS += ${TRACEOBJS}
-endif
-
-#------------------------------------------------------------------------
-#rules
-
-.PHONY: all clean distclean strip
-
-#all: ${ALL}
-# ${MAKE} -f ${MAKEFILEDIR}.AMUmakefile ${BINDIR}.${TARGET}
-
-all: ${BINDIR}.${TARGET} ${ALL}
-
-${TARGET}: ${OBJS}
- ${LD} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
- SetType $@ Absolute
- Access $@ WR/R
-
-${BINDIR}.${TARGET}: ${TARGET}
- ${MD} ${BINDIR}
- ${CP} ${TARGET} $@ ${COPYFLAGS}
-
-clean: ;-${RM} ${OBJS} ${TRACEOBJS} ${TARGET} ${EXTRAOBJS}
-
-distclean: clean strip
- ${RM} o l
-
-strip: ;${STRIP} AMUmakefile
-
-#------------------------------------------------------------------------
-.SUFFIXES: .o .c .s .y
-
-.c.o: ;${MD} o
- ${CC} -o $@ -c $<
-
-.s.o: ;${MD} o
- ${ASM} -apcs 3/${APCS}bit $< $@
-
-#------------------------------------------------------------------------
Modified: branches/simplified-build/!OsLib/Tools/BindHelp/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/BindHelp/Makefile 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/BindHelp/Makefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -28,7 +28,7 @@
$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
clean:
- -$(RM) $(TARGET) *.o
+ -$(RM) $(TARGET) *.o $(bindir)/$(TARGET)
$(TARGET): $(OBJS)
$(CC) $(ALL_LDFLAGS) -o $@ $(OBJS)
Modified: branches/simplified-build/!OsLib/Tools/DefMod2/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/DefMod2/Makefile 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/DefMod2/Makefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -37,7 +37,7 @@
$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
clean:
- -$(RM) $(TARGET) *.o defmod.c
+ -$(RM) $(TARGET) *.o defmod.c $(bindir)/$(TARGET)
$(TARGET): $(OBJS)
$(CC) $(ALL_LDFLAGS) -o $@ $(OBJS)
Deleted: branches/simplified-build/!OsLib/Tools/GNUmakefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/GNUmakefile 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/GNUmakefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -1,27 +0,0 @@
-#
-# Makefile for OSLib Tools for UNIX.
-#
-
-#------------------------------------------------------------------------
-#targets
-ALL = BindHelp DefMod2 IndexHelp ReduceAOF
-
-.PHONY: ${ALL} clean
-
-all: ${ALL}
-
-BindHelp:
- ${MAKE} -C BindHelp
-
-DefMod2:
- ${MAKE} -C DefMod2
-
-IndexHelp:
- ${MAKE} -C IndexHelp
-
-ReduceAOF:
- ${MAKE} -C ReduceAOF
-
-clean: ;$(foreach TARGET, ${ALL}, ${MAKE} -C ${TARGET} clean; )
-
-#------------------------------------------------------------------------
Deleted: branches/simplified-build/!OsLib/Tools/GNUmakefile.source
===================================================================
--- branches/simplified-build/!OsLib/Tools/GNUmakefile.source 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/GNUmakefile.source 2007-04-29 22:03:34 UTC (rev 256)
@@ -1,56 +0,0 @@
-#
-# Include Makefile for Tools under UNIX.
-#
-# caller must define TARGET, MODULES, INCLUDES
-# caller may define DEFINES, VPATH
-
-#TARGET = reduceaof
-#OBJS = ${TARGET}.o
-#INCLUDES =
-#VPATH =
-
-BINDIR ?= ../../Bin
-TRACE ?= 0
-DEBUG ?= 0
-
-#------------------------------------------------------------------------
-#tools
-
-CC = /usr/bin/gcc
-LD = /usr/bin/gcc
-CP = cp -f
-RM = rm -f
-
-#------------------------------------------------------------------------
-#macros
-DEFINES ?= -DUNIX -DEXECUTE_ON_UNIX -D__swi
-CFLAGS = -Wall -funsigned-char
-OBJS = $(patsubst %,%.o,${MODULES})
-TRACEOBJS = $(patsubst %,%.o,${TRACEMODULES})
-
-ifneq (${TRACE},0)
- OBJS += ${TRACEOBJS}
-endif
-
-#------------------------------------------------------------------------
-#rules
-
-.PHONY: all clean install
-
-all: ${TARGET}
-
-${TARGET}: ${OBJS}
- ${LD} ${LDFLAGS} -o $@ ${OBJS}
- if [ ! -d ${BINDIR} ]; then mkdir ${BINDIR}; fi
- ${CP} $@ ${BINDIR}/
-
-clean: ;-${RM} ${OBJS} ${TRACEOBJS} ${TARGET}
-
-
-#------------------------------------------------------------------------
-.SUFFIXES: .o .c
-
-.c.o: ;${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -DTRACE=${TRACE} \
- -DDEBUG=${DEBUG} -o $@ -c $<
-
-#------------------------------------------------------------------------
Modified: branches/simplified-build/!OsLib/Tools/IndexHelp/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/IndexHelp/Makefile 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/IndexHelp/Makefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -27,7 +27,7 @@
$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
clean:
- -$(RM) $(TARGET) *.o
+ -$(RM) $(TARGET) *.o $(bindir)/$(TARGET)
$(TARGET): $(OBJS)
$(CC) $(ALL_LDFLAGS) -o $@ $(OBJS)
Deleted: branches/simplified-build/!OsLib/Tools/Make,fd7
===================================================================
--- branches/simplified-build/!OsLib/Tools/Make,fd7 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/Make,fd7 2007-04-29 22:03:34 UTC (rev 256)
@@ -1,5 +0,0 @@
-| Tools.Make 20040306
-set Make$Dir <Obey$Dir>
-if "<C$MODE>" = "32" then Do AMU -f <Make$Dir>.AMUmakefile -desktop %0 APCS=32
-if "<C$MODE>" <>"32" then Do AMU -f <Make$Dir>.AMUmakefile -desktop %0 APCS=26
-Echo <Sys$Time> Done...
\ No newline at end of file
Copied: branches/simplified-build/!OsLib/Tools/Makefile (from rev 246, branches/simplified-build/!OsLib/Tools/GNUmakefile)
===================================================================
--- branches/simplified-build/!OsLib/Tools/Makefile (rev 0)
+++ branches/simplified-build/!OsLib/Tools/Makefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -0,0 +1,25 @@
+# ...
+
+ALL = BindHelp DefMod2 IndexHelp ReduceAOF
+
+.PHONY: ${ALL} install clean
+
+all: ${ALL}
+
+BindHelp:
+ ${MAKE} -C BindHelp
+
+DefMod2:
+ ${MAKE} -C DefMod2
+
+IndexHelp:
+ ${MAKE} -C IndexHelp
+
+ReduceAOF:
+ ${MAKE} -C ReduceAOF
+
+install:
+ $(foreach TARGET, ${ALL}, ${MAKE} -C ${TARGET} install; )
+
+clean:
+ $(foreach TARGET, ${ALL}, ${MAKE} -C ${TARGET} clean; )
Deleted: branches/simplified-build/!OsLib/Tools/Makefile,fe1
===================================================================
--- branches/simplified-build/!OsLib/Tools/Makefile,fe1 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/Makefile,fe1 2007-04-29 22:03:34 UTC (rev 256)
@@ -1,69 +0,0 @@
-# Index: OSLib/!OsLib/Tools/Makefile,fe1 20031230
-#===================================================================
-#
-DIR = <OSLib$ToolsDir>
-COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V
-
-RM = OSLibBin:rm
-MAKE = amu -desktop
-
-# build all tools
-all: stage2 stage1
- @echo
-
-# build tools which don't depend on OSLib
-stage1:
- ${MAKE} -f ${DIR}.bison.Makefile all APCS=${APCS} OSLIB=${OSLIB}
- ${MAKE} -f ${DIR}.DefMod2.defmod.Build_RISCOS.Makefile all APCS=${APCS} OSLIB=${OSLIB}
- ${MAKE} -f ${DIR}.ReduceAOF.Makefile all APCS=${APCS} OSLIB=${OSLIB}
- ${MAKE} -f ${DIR}.Rm.Makefile all APCS=${APCS} OSLIB=${OSLIB}
- ${MAKE} -f ${DIR}.ToLower.Makefile all APCS=${APCS} OSLIB=${OSLIB}
-
-# build tools which depend on OSLib
-stage2:
- ${MAKE} -f ${DIR}.BindHelp.Makefile all APCS=${APCS} OSLIB=${OSLIB}
- ${MAKE} -f ${DIR}.IndexHelp.Makefile all APCS=${APCS} OSLIB=${OSLIB}
- ${MAKE} -f ${DIR}.StripDepends.Makefile all APCS=${APCS} OSLIB=${OSLIB}
-
-# build the directory tree
-tree:
- ${MAKE} -f ${DIR}.BindHelp.Makefile tree
- ${MAKE} -f ${DIR}.DefMod2.defmod.Build_RISCOS.Makefile tree
- ${MAKE} -f ${DIR}.IndexHelp.Makefile tree
- ${MAKE} -f ${DIR}.ReduceAOF.Makefile tree
- ${MAKE} -f ${DIR}.Rm.Makefile tree
- ${MAKE} -f ${DIR}.StripDepends.Makefile tree
- ${MAKE} -f ${DIR}.bison.Makefile tree
- ${MAKE} -f ${DIR}.ToLower.Makefile tree
- @ifthere ${DIR}.tree then stamp ${DIR}.tree else create ${DIR}.tree
-
-clean:
- ${MAKE} -f ${DIR}.BindHelp.Makefile clean
- ${MAKE} -f ${DIR}.DefMod2.defmod.Build_RISCOS.Makefile clean
- ${MAKE} -f ${DIR}.IndexHelp.Makefile clean
- ${MAKE} -f ${DIR}.ReduceAOF.Makefile clean
- ${MAKE} -f ${DIR}.Rm.Makefile clean
- ${MAKE} -f ${DIR}.StripDepends.Makefile clean
- ${MAKE} -f ${DIR}.bison.Makefile clean
- ${MAKE} -f ${DIR}.ToLower.Makefile clean
-
-stripdepends:
- ${MAKE} -f ${DIR}.BindHelp.Makefile stripdepends
- ${MAKE} -f ${DIR}.DefMod2.defmod.Build_RISCOS.Makefile stripdepends
- ${MAKE} -f ${DIR}.IndexHelp.Makefile stripdepends
- ${MAKE} -f ${DIR}.ReduceAOF.Makefile stripdepends
- ${MAKE} -f ${DIR}.Rm.Makefile stripdepends
- ${MAKE} -f ${DIR}.StripDepends.Makefile stripdepends
- ${MAKE} -f ${DIR}.bison.Makefile stripdepends
- ${MAKE} -f ${DIR}.ToLower.Makefile stripdepends
-
-archive_source:
- cdir ${ARCHIVE}
- copy * ${ARCHIVE}.* ${COPYFLAGS}
- ${MAKE} -f ${DIR}.BindHelp.Makefile archive_source ARCHIVE=${ARCHIVE}.BindHelp
- ${MAKE} -f ${DIR}.DefMod2.defmod.Build_RISCOS.Makefile archive_source ARCHIVE=${ARCHIVE}.DefMod2
- ${MAKE} -f ${DIR}.IndexHelp.Makefile archive_source ARCHIVE=${ARCHIVE}.IndexHelp
- ${MAKE} -f ${DIR}.ReduceAOF.Makefile archive_source ARCHIVE=${ARCHIVE}.ReduceAOF
- ${MAKE} -f ${DIR}.Rm.Makefile archive_source ARCHIVE=${ARCHIVE}.Rm
- ${MAKE} -f ${DIR}.StripDepends.Makefile archive_source ARCHIVE=${ARCHIVE}.StripDepends
- ${MAKE} -f ${DIR}.bison.Makefile archive_source ARCHIVE=${ARCHIVE}.bison
Modified: branches/simplified-build/!OsLib/Tools/ReduceAOF/Makefile
===================================================================
--- branches/simplified-build/!OsLib/Tools/ReduceAOF/Makefile 2007-04-29 21:55:38 UTC (rev 255)
+++ branches/simplified-build/!OsLib/Tools/ReduceAOF/Makefile 2007-04-29 22:03:34 UTC (rev 256)
@@ -27,7 +27,7 @@
$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
clean:
- -$(RM) $(TARGET) *.o
+ -$(RM) $(TARGET) *.o $(bindir)/$(TARGET)
$(TARGET): $(OBJS)
$(CC) $(ALL_LDFLAGS) -o $@ $(OBJS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
