--- a/sbsv2/raptor/util/talon/Makefile	Wed Jul 28 13:20:46 2010 +0100
+++ b/sbsv2/raptor/util/talon/Makefile	Thu Aug 12 09:00:16 2010 +0100
@@ -14,58 +14,6 @@
 # Utility makefile 
 #
 #
-
-
-SHELL:=bash
-
-include $(SBS_HOME:\=/)/util/gccprogram.mk
-
-ifeq ($(filter win,$(HOSTPLATFORM)),win)
-CHOMP_C:=chomp.c
-PROCESS_C:=process_win.c
-CFLAGS:=-DHOST_WIN
-ifeq ($(SBS_MINGW),)
-LDFLAGS:=$(subst \,/,$(SBS_HOME:\=/)\win32\mingw\lib\libiberty.a)
-else
-LDFLAGS:=$(subst \,/,$(SBS_MINGW:\=/)\lib\libiberty.a)
-endif
-LDFLAGS:=$(LDFLAGS) -Wl,-lws2_32
-else
-CHOMP_C:=
-PROCESS_C:=process.c
-CFLAGS:=-g
-linux_PTHREADLIBS:=-lpthread
-LDFLAGS:=$(linux_PTHREADLIBS) -lrt
-endif
-
-
-SOURCEDIR:=$(subst \,/,$(SBS_HOME))/util/talon
-
-
-# remember how to clean up:
-MANIFEST:=$(SOURCEDIR)/manifest
-
-TARGET:=talon
-SOURCES:=$(addprefix $(SOURCEDIR)/,talon.c buffer.c sema.c log.c $(PROCESS_C) $(CHOMP_C)) 
-$(eval $(cprogram))
-
-TARGET:=talonctl
-SOURCES:=$(addprefix $(SOURCEDIR)/,talonctl.c sema.c log.c)
-$(eval $(cprogram))
-
-TARGET:=testbuffer
-SOURCES:=$(addprefix $(SOURCEDIR)/,testbuffer.c buffer.c log.c)
-$(eval $(cprogram))
-
-TARGET:=testprocess
-SOURCES:=$(addprefix $(SOURCEDIR)/,testprocess.c buffer.c log.c  $(PROCESS_C))
-$(eval $(cprogram))
-
-TARGET:=talonlock
-SOURCES:=$(addprefix $(SOURCEDIR)/,lock.c sema.c log.c)
-$(eval $(cprogram))
-
-TARGET:=testchomp
-SOURCES:=$(addprefix $(SOURCEDIR)/,testchomp.c chomp.c log.c)
-$(eval $(cprogram))
-
+.PHONY: all
+all:
+	cd .. && make talon