--- projects/cms/source/server/Makefile	2000/12/12 02:45:54	1.6.2.5
+++ projects/cms/source/server/Makefile	2000/12/11 17:20:44	1.7
@@ -1,30 +1,43 @@
 # Makefile for server
-# $Id: Makefile,v 1.6.2.5 2000/12/12 02:45:54 tdb Exp $
+# $Id: Makefile,v 1.7 2000/12/11 17:20:44 ajm Exp $
 
-include Config.inc
+IDL = idl/.madeidl
 
-all : buildidl code build
+all : idl code
 
 idl : $(IDL)
 $(IDL) : idl/iscream.idl
-	cd idl && $(MAKE) idl
+	cd idl && $(MAKE) all
 
-buildidl : $(IDL) idl
-	cd idl && $(MAKE) build
-
-code : buildidl
+code :
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
 clean :
 	cd idl && $(MAKE) clean
-	cd build && $(MAKE) clean
 	cd uk/ac/ukc/iscream && $(MAKE) clean
-	rm -Rf $(BUILDCHECK) $(IDLCHECK)
 
-run : build
-	cd build && java -jar iscream.jar
+update :
+	cvs -q -d /usr/local/proj/co600_10/cvs update
 
-build : code
-	cd build && $(MAKE) package
+runclientinterface :
+	cd uk/ac/ukc/iscream/clientinterface && $(MAKE) all
+	java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
 
-include $(MKINC)
+run : all
+	java uk.ac.ukc.iscream.componentmanager.ComponentManager -l etc/default.properties
+
+rundbinterface :
+	cd uk/ac/ukc/iscream/dbinterface && $(MAKE) all
+	java uk.ac.ukc.iscream.dbinterface.DBInterfaceMain
+
+runfiltermanager :
+	cd uk/ac/ukc/iscream/filtermanager && $(MAKE) all
+	java uk.ac.ukc.iscream.filtermanager.FilterManager
+
+runrootfilter :
+	cd uk/ac/ukc/iscream/rootfilter && $(MAKE) all
+	java uk.ac.ukc.iscream.rootfilter.RootFilterMain
+
+runfilter :
+	cd uk/ac/ukc/iscream/filter && $(MAKE) all
+	java uk.ac.ukc.iscream.filter.FilterMain $(NAME)