--- projects/cms/source/server/Makefile	2000/12/05 02:33:13	1.5
+++ projects/cms/source/server/Makefile	2000/12/11 20:19:36	1.6.2.1
@@ -1,40 +1,53 @@
 # Makefile for server
-# $Id: Makefile,v 1.5 2000/12/05 02:33:13 tdb Exp $
+# $Id: Makefile,v 1.6.2.1 2000/12/11 20:19:36 tdb Exp $
 
 IDL = idl/.madeidl
 
-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/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 :
 	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
-	java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
+	cd build && java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
 
 runcore :
 	cd uk/ac/ukc/iscream/core && $(MAKE) all
-	java uk.ac.ukc.iscream.core.Core -l etc/default.properties
+	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
-	java uk.ac.ukc.iscream.filtermanager.FilterManager
+	cd build && java uk.ac.ukc.iscream.filtermanager.FilterManager
 
 runrootfilter :
 	cd uk/ac/ukc/iscream/rootfilter && $(MAKE) all
-	java uk.ac.ukc.iscream.rootfilter.RootFilterMain
+	cd build &&java uk.ac.ukc.iscream.rootfilter.RootFilterMain
 
 runfilter :
 	cd uk/ac/ukc/iscream/filter && $(MAKE) all
-	java uk.ac.ukc.iscream.filter.FilterMain $(NAME)
+	cd build && java uk.ac.ukc.iscream.filter.FilterMain $(NAME)
+
+build : all
+	cd build && $(MAKE) package