--- projects/cms/source/server/Makefile	2000/12/11 20:19:36	1.6.2.1
+++ projects/cms/source/server/Makefile	2000/12/12 02:45:54	1.6.2.5
@@ -1,53 +1,30 @@
 # Makefile for server
-# $Id: Makefile,v 1.6.2.1 2000/12/11 20:19:36 tdb Exp $
+# $Id: Makefile,v 1.6.2.5 2000/12/12 02:45:54 tdb Exp $
 
-IDL = idl/.madeidl
+include Config.inc
 
-all : buildidl code
+all : buildidl code build
 
 idl : $(IDL)
 $(IDL) : idl/iscream.idl
 	cd idl && $(MAKE) idl
 
 buildidl : $(IDL) idl
-	cd idl/uk/ac/ukc/iscream/clientinterface && javac -g:none -O -d ../../../../../../build *.java
-	cd idl/uk/ac/ukc/iscream/core && javac -g:none -O -d ../../../../../../build *.java
-	cd idl/uk/ac/ukc/iscream/filter && javac -g:none -O -d ../../../../../../build *.java
+	cd idl && $(MAKE) build
 
-code :
+code : buildidl
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
 clean :
 	cd idl && $(MAKE) clean
-	cd uk/ac/ukc/iscream && $(MAKE) clean
 	cd build && $(MAKE) clean
+	cd uk/ac/ukc/iscream && $(MAKE) clean
+	rm -Rf $(BUILDCHECK) $(IDLCHECK)
 
-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
-	cd build && java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
-
-runcore :
-	cd uk/ac/ukc/iscream/core && $(MAKE) all
-	cd build && java uk.ac.ukc.iscream.core.Core -l etc/default.properties
-
-rundbinterface :
-	cd uk/ac/ukc/iscream/dbinterface && $(MAKE) all
-	cd build && java uk.ac.ukc.iscream.dbinterface.DBInterfaceMain
-
-runfiltermanager :
-	cd uk/ac/ukc/iscream/filtermanager && $(MAKE) all
-	cd build && java uk.ac.ukc.iscream.filtermanager.FilterManager
-
-runrootfilter :
-	cd uk/ac/ukc/iscream/rootfilter && $(MAKE) all
-	cd build &&java uk.ac.ukc.iscream.rootfilter.RootFilterMain
-
-runfilter :
-	cd uk/ac/ukc/iscream/filter && $(MAKE) all
-	cd build && java uk.ac.ukc.iscream.filter.FilterMain $(NAME)
-
-build : all
+build : code
 	cd build && $(MAKE) package
+
+include $(MKINC)