--- projects/cms/source/util/uk/org/iscream/cms/util/Makefile	2000/12/11 20:29:32	1.3.2.1
+++ projects/cms/source/util/uk/org/iscream/cms/util/Makefile	2001/02/04 04:53:22	1.9
@@ -1,33 +1,19 @@
 # Makefile for uk.ac.ukc.iscream.util
-# $Id: Makefile,v 1.3.2.1 2000/12/11 20:29:32 tdb Exp $
+# $Id: Makefile,v 1.9 2001/02/04 04:53:22 tdb Exp $
 
-# Defining Filenames
+# Config Include
+include ../../../../../Config.inc
 
-CLASS = AlreadyInitialisedException.class NotInitialisedException.class\
-        ReferenceManager.class XMLPacket.class XMLPacketMaker.class\
-        XMLStringParser.class FormatName.class
+# Defining Filenames (these will all be built)
 
-IDL = ../../../../../idl/.madeidl
-IDLFILES = ../../../../../idl/uk
-IDLMAKE = cd ../../../../.. && $(MAKE) buildidl
+JAVA = XMLPacket.java XMLPacketMaker.java\
+       XMLStringParser.java FormatName.java\
+       Queue.java InvalidQueueException.java\
+       DateUtils.java StringUtils.java
 
-BUILD = ../../../../../build
+# Build Rule
+all : DOBUILD
+clean : DOCLEAN
 
-# Defining "shortcuts" for building
-
-all : $(IDL) $(CLASS)
-
-clean :
-	rm -f $(CLASS)
-
-update :
-	cvs -q -d /usr/local/proj/co600_10/cvs update -d
-
-# Dependencies, and building
-
-# clever catchall to build any .class file from a .java file
-%.class : %.java
-	javac -g:none -O -d $(BUILD) $<
-
-$(IDL) : ../../../../../idl/iscream.idl
-	$(IDLMAKE)
+# Main Include
+include $(MKINC)