--- projects/cms/source/server/Makefile	2000/12/06 16:45:08	1.6
+++ projects/cms/source/server/Makefile	2000/12/11 23:43:50	1.6.2.2
@@ -1,44 +1,28 @@
 # Makefile for server
-# $Id: Makefile,v 1.6 2000/12/06 16:45:08 tdb Exp $
+# $Id: Makefile,v 1.6.2.2 2000/12/11 23:43:50 tdb Exp $
 
-IDL = idl/.madeidl
+include Config.inc
 
-all : idl code
+all : buildidl code
 
 idl : $(IDL)
 $(IDL) : idl/iscream.idl
-	cd idl && $(MAKE) all
+	cd idl && $(MAKE) idl
 
+buildidl : $(IDL) idl
+	cd idl && $(MAKE) build
+
 code :
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
 clean :
 	cd idl && $(MAKE) clean
-	cd uk/ac/ukc/iscream && $(MAKE) clean
+	cd build && $(MAKE) clean
 
-update :
-	cvs -q -d /usr/local/proj/co600_10/cvs update
+run : build
+	cd build && java -jar iscream.jar
 
-runclientinterface :
-	cd uk/ac/ukc/iscream/clientinterface && $(MAKE) all
-	java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
+build : all
+	cd build && $(MAKE) package
 
-runcore :
-	cd uk/ac/ukc/iscream/core && $(MAKE) all
-	java uk.ac.ukc.iscream.core.Core -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)
+include $(MKINC)