--- projects/cms/source/server/Makefile	2000/11/16 14:46:53	1.2
+++ projects/cms/source/server/Makefile	2000/12/11 20:19:36	1.6.2.1
@@ -1,23 +1,53 @@
 # Makefile for server
-# $Id: Makefile,v 1.2 2000/11/16 14:46:53 tdb Exp $
+# $Id: Makefile,v 1.6.2.1 2000/12/11 20:19:36 tdb Exp $
 
-all : idl core filter
+IDL = idl/.madeidl
 
-core :
-	cd CORE && $(MAKE)
+all : buildidl code
 
-filter :
-	cd Filter && $(MAKE)
+idl : $(IDL)
+$(IDL) : idl/iscream.idl
+	cd idl && $(MAKE) idl
 
-idl : iscream.idl
-	idl iscream.idl
-	@touch .madeidl
+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
 
+code :
+	cd uk/ac/ukc/iscream && $(MAKE) all
+
 clean :
-	rm -Rf uk
-	rm -f .madeidl
-	cd CORE && $(MAKE) clean
-	cd Filter && $(MAKE) 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
+
+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
+	cd build && $(MAKE) package